summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)AuthorFilesLines
2010-01-20Merge branch 'jc/conflict-marker-size'Junio C Hamano2-10/+25
2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2-8/+18
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2-2/+7
2009-11-29git-merge-file --ours, --theirsJunio C Hamano2-3/+14
2009-08-31Merge branch 'tf/diff-whitespace-incomplete-line'Junio C Hamano1-33/+53
2009-08-23xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano1-31/+49
2009-08-23xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano1-2/+4
2009-07-22refactor: use bitsizeof() instead of 8 * sizeof()Pierre Habouzit1-1/+1
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano1-16/+15
2009-05-24Change xdl_merge to generate output even for null mergesCharles Bailey1-16/+15
2009-04-22Fix typos / spelling in commentsMike Ralphson1-1/+1
2009-03-15Fix various dead stores found by the clang static analyzerBenjamin Kramer2-4/+3
2009-02-05Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano1-2/+4
2009-01-23Merge branch 'js/patience-diff'Junio C Hamano5-1/+389
2009-01-21Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano1-2/+4
2009-01-19Fix combined use of whitespace ignore options to diffKeith Cascio1-2/+4
2009-01-07Implement the patience diff algorithmJohannes Schindelin5-1/+389
2008-12-29diff: add option to show context between close hunksRené Scharfe2-1/+3
2008-12-02xdiff: give up scanning similar lines earlyDavide Libenzi1-2/+13
2008-11-12Merge branch 'dl/xdiff'Junio C Hamano1-2/+13
2008-11-08xdiff: give up scanning similar lines earlyDavide Libenzi1-2/+13
2008-10-25Allow alternate "low-level" emit function from xdl_diffBrian Downing4-3/+8
2008-08-30xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano1-0/+9
2008-08-30xmerge.c: minimum readability fixupsJunio C Hamano1-7/+7
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2-19/+90
2008-08-30xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano1-50/+69
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2-4/+28
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin1-1/+46
2007-11-15Remove unreachable statementsGuido Ostkamp2-4/+0
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano2-14/+27
2007-06-08Missing statics.Pierre Habouzit1-2/+2
2007-06-07War on whitespaceJunio C Hamano12-12/+0
2007-03-19xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingJohannes Schindelin1-2/+20
2007-02-13teach diff machinery about --ignore-space-at-eolJohannes Schindelin2-1/+26
2006-12-30Fix yet another subtle xdl_merge() bugJohannes Schindelin1-2/+5
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin1-0/+4
2006-12-12Merge branch 'master' into js/mergeJunio C Hamano1-1/+2
2006-12-05xdl_merge(): fix and simplify conflict handlingJohannes Schindelin1-16/+5
2006-12-04diff -b: ignore whitespace at end of lineJohannes Schindelin1-1/+2
2006-12-02xdl_merge(): fix thinkoJohannes Schindelin1-2/+2
2006-12-02xdl_merge(): fix an off-by-one bugJohannes Schindelin1-5/+5
2006-12-02xmerge: make return value from xdl_merge() more usable.Junio C Hamano1-10/+7
2006-12-02xdiff: add xdl_merge()Johannes Schindelin4-2/+442
2006-11-23Increase length of function name bufferAndy Parkins1-1/+1
2006-10-25xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of linesPetr Baudis1-2/+1
2006-10-23xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.Jim Meyering1-1/+1
2006-10-16Merge branch 'maint'Junio C Hamano1-2/+3
2006-10-16Fix hash function in xdiff libraryv1.4.2.4Linus Torvalds1-2/+3
2006-10-12diff: fix 2 whitespace issuesJohannes Schindelin1-17/+12
2006-07-12Merge branch 'lt/merge-tree'Junio C Hamano2-0/+19
generated by cgit (git 2.54.0.dirty) at 2026-09-16 00:55:17 +0000