summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)Author
2010-01-20Merge branch 'jc/conflict-marker-size'Junio C Hamano
2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano
2009-11-29git-merge-file --ours, --theirsJunio C Hamano
2009-08-31Merge branch 'tf/diff-whitespace-incomplete-line'Junio C Hamano
2009-08-23xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano
2009-08-23xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano
2009-07-22refactor: use bitsizeof() instead of 8 * sizeof()Pierre Habouzit
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano
2009-05-24Change xdl_merge to generate output even for null mergesCharles Bailey
2009-04-22Fix typos / spelling in commentsMike Ralphson
2009-03-15Fix various dead stores found by the clang static analyzerBenjamin Kramer
2009-02-05Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano
2009-01-23Merge branch 'js/patience-diff'Junio C Hamano
2009-01-21Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano
2009-01-19Fix combined use of whitespace ignore options to diffKeith Cascio
2009-01-07Implement the patience diff algorithmJohannes Schindelin
2008-12-29diff: add option to show context between close hunksRené Scharfe
2008-12-02xdiff: give up scanning similar lines earlyDavide Libenzi
2008-11-12Merge branch 'dl/xdiff'Junio C Hamano
2008-11-08xdiff: give up scanning similar lines earlyDavide Libenzi
2008-10-25Allow alternate "low-level" emit function from xdl_diffBrian Downing
2008-08-30xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano
2008-08-30xmerge.c: minimum readability fixupsJunio C Hamano
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano
2008-08-30xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin
2007-11-15Remove unreachable statementsGuido Ostkamp
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano
2007-06-08Missing statics.Pierre Habouzit
2007-06-07War on whitespaceJunio C Hamano
2007-03-19xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingJohannes Schindelin
2007-02-13teach diff machinery about --ignore-space-at-eolJohannes Schindelin
2006-12-30Fix yet another subtle xdl_merge() bugJohannes Schindelin
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin
2006-12-12Merge branch 'master' into js/mergeJunio C Hamano
2006-12-05xdl_merge(): fix and simplify conflict handlingJohannes Schindelin
2006-12-04diff -b: ignore whitespace at end of lineJohannes Schindelin
2006-12-02xdl_merge(): fix thinkoJohannes Schindelin
2006-12-02xdl_merge(): fix an off-by-one bugJohannes Schindelin
2006-12-02xmerge: make return value from xdl_merge() more usable.Junio C Hamano
2006-12-02xdiff: add xdl_merge()Johannes Schindelin
2006-11-23Increase length of function name bufferAndy Parkins
2006-10-25xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of linesPetr Baudis
2006-10-23xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.Jim Meyering
2006-10-16Merge branch 'maint'Junio C Hamano
2006-10-16Fix hash function in xdiff libraryv1.4.2.4Linus Torvalds
2006-10-12diff: fix 2 whitespace issuesJohannes Schindelin
2006-07-12Merge branch 'lt/merge-tree'Junio C Hamano
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-30 16:34:09 +0000