summaryrefslogtreecommitdiffstats
path: root/xdiff
AgeCommit message (Expand)AuthorLines
2010-11-17Merge branch 'cb/diff-fname-optim'Junio C Hamano-24/+14
2010-10-06xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder-10/+11
2010-09-30diff: avoid repeated scanning while looking for funcnameRené Scharfe-24/+14
2010-07-05xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid-1/+3
2010-05-01xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin-9/+8
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder-10/+14
2010-03-20xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder-2/+15
2010-03-02refactor merge flags into xmparam_tBert Wesarg-12/+11
2010-03-02make union merge an xdl merge favorBert Wesarg-7/+14
2010-01-20Merge branch 'jc/conflict-marker-size'Junio C Hamano-10/+25
2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano-8/+18
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano-2/+7
2009-11-29git-merge-file --ours, --theirsJunio C Hamano-3/+14
2009-08-31Merge branch 'tf/diff-whitespace-incomplete-line'Junio C Hamano-33/+53
2009-08-23xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano-31/+49
2009-08-23xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano-2/+4
2009-07-22refactor: use bitsizeof() instead of 8 * sizeof()Pierre Habouzit-1/+1
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano-16/+15
2009-05-24Change xdl_merge to generate output even for null mergesCharles Bailey-16/+15
2009-04-22Fix typos / spelling in commentsMike Ralphson-1/+1
2009-03-15Fix various dead stores found by the clang static analyzerBenjamin Kramer-4/+3
2009-02-05Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano-2/+4
2009-01-23Merge branch 'js/patience-diff'Junio C Hamano-1/+389
2009-01-21Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano-2/+4
2009-01-19Fix combined use of whitespace ignore options to diffKeith Cascio-2/+4
2009-01-07Implement the patience diff algorithmJohannes Schindelin-1/+389
2008-12-29diff: add option to show context between close hunksRené Scharfe-1/+3
2008-12-02xdiff: give up scanning similar lines earlyDavide Libenzi-2/+13
2008-11-12Merge branch 'dl/xdiff'Junio C Hamano-2/+13
2008-11-08xdiff: give up scanning similar lines earlyDavide Libenzi-2/+13
2008-10-25Allow alternate "low-level" emit function from xdl_diffBrian Downing-3/+8
2008-08-30xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano-0/+9
2008-08-30xmerge.c: minimum readability fixupsJunio C Hamano-7/+7
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano-19/+90
2008-08-30xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano-51/+70
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin-4/+28
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin-1/+46
2007-11-15Remove unreachable statementsGuido Ostkamp-4/+0
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano-14/+27
2007-06-08Missing statics.Pierre Habouzit-2/+2
2007-06-07War on whitespaceJunio C Hamano-12/+0
2007-03-19xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingJohannes Schindelin-2/+20
2007-02-13teach diff machinery about --ignore-space-at-eolJohannes Schindelin-1/+26
2006-12-30Fix yet another subtle xdl_merge() bugJohannes Schindelin-2/+5
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin-0/+4
2006-12-12Merge branch 'master' into js/mergeJunio C Hamano-1/+2
2006-12-05xdl_merge(): fix and simplify conflict handlingJohannes Schindelin-16/+5
2006-12-04diff -b: ignore whitespace at end of lineJohannes Schindelin-1/+2
2006-12-02xdl_merge(): fix thinkoJohannes Schindelin-2/+2
2006-12-02xdl_merge(): fix an off-by-one bugJohannes Schindelin-5/+5
generated by cgit v1.2.3 (git 2.46.0) at 2026-07-15 19:11:01 +0000