summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)AuthorFilesLines
2010-11-24Merge branch 'cb/diff-fname-optim' into maintLibravatar Junio C Hamano1-24/+14
2010-10-06xdiff: cast arguments for ctype functions to unsigned charLibravatar Jonathan Nieder3-10/+11
2010-09-30diff: avoid repeated scanning while looking for funcnameLibravatar René Scharfe1-24/+14
2010-07-05xdiff: optimise for no whitespace difference when ignoring whitespace.Libravatar Dylan Reid1-1/+3
2010-05-01xdiff/xmerge.c: use memset() instead of explicit for-loopLibravatar Alexey Mahotkin1-9/+8
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureLibravatar Jonathan Nieder2-10/+14
2010-03-20xdl_merge(): add optional ancestor label to diff3-style outputLibravatar Jonathan Nieder2-2/+15
2010-03-02refactor merge flags into xmparam_tLibravatar Bert Wesarg2-12/+11
2010-03-02make union merge an xdl merge favorLibravatar Bert Wesarg2-7/+14
2010-01-20Merge branch 'jc/conflict-marker-size'Libravatar Junio C Hamano2-10/+25
2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tLibravatar Junio C Hamano2-8/+18
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersLibravatar Junio C Hamano2-2/+7
2009-11-29git-merge-file --ours, --theirsLibravatar Junio C Hamano2-3/+14
2009-08-31Merge branch 'tf/diff-whitespace-incomplete-line'Libravatar Junio C Hamano1-33/+53
2009-08-23xutils: Fix xdl_recmatch() on incomplete linesLibravatar Junio C Hamano1-31/+49
2009-08-23xutils: Fix hashing an incomplete line with whitespaces at the endLibravatar Junio C Hamano1-2/+4
2009-07-22refactor: use bitsizeof() instead of 8 * sizeof()Libravatar Pierre Habouzit1-1/+1
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintLibravatar Junio C Hamano1-16/+15
2009-05-24Change xdl_merge to generate output even for null mergesLibravatar Charles Bailey1-16/+15
2009-04-22Fix typos / spelling in commentsLibravatar Mike Ralphson1-1/+1
2009-03-15Fix various dead stores found by the clang static analyzerLibravatar Benjamin Kramer2-4/+3
2009-02-05Merge branch 'kc/maint-diff-bwi-fix' into maintLibravatar Junio C Hamano1-2/+4
2009-01-23Merge branch 'js/patience-diff'Libravatar Junio C Hamano5-1/+389
2009-01-21Merge branch 'kc/maint-diff-bwi-fix'Libravatar Junio C Hamano1-2/+4
2009-01-19Fix combined use of whitespace ignore options to diffLibravatar Keith Cascio1-2/+4
2009-01-07Implement the patience diff algorithmLibravatar Johannes Schindelin5-1/+389
2008-12-29diff: add option to show context between close hunksLibravatar René Scharfe2-1/+3
2008-12-02xdiff: give up scanning similar lines earlyLibravatar Davide Libenzi1-2/+13
2008-11-12Merge branch 'dl/xdiff'Libravatar Junio C Hamano1-2/+13
2008-11-08xdiff: give up scanning similar lines earlyLibravatar Davide Libenzi1-2/+13
2008-10-25Allow alternate "low-level" emit function from xdl_diffLibravatar Brian Downing4-3/+8
2008-08-30xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessLibravatar Junio C Hamano1-0/+9
2008-08-30xmerge.c: minimum readability fixupsLibravatar Junio C Hamano1-7/+7
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleLibravatar Junio C Hamano2-19/+90
2008-08-30xdl_fill_merge_buffer(): separate out a too deeply nested functionLibravatar Junio C Hamano1-51/+70
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMLibravatar Johannes Schindelin2-4/+28
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerLibravatar Johannes Schindelin1-1/+46
2007-11-15Remove unreachable statementsLibravatar Guido Ostkamp2-4/+0
2007-07-06Per-path attribute based hunk header selection.Libravatar Junio C Hamano2-14/+27
2007-06-08Missing statics.Libravatar Pierre Habouzit1-2/+2
2007-06-07War on whitespaceLibravatar Junio C Hamano12-12/+0
2007-03-19xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingLibravatar Johannes Schindelin1-2/+20
2007-02-13teach diff machinery about --ignore-space-at-eolLibravatar Johannes Schindelin2-1/+26
2006-12-30Fix yet another subtle xdl_merge() bugLibravatar Johannes Schindelin1-2/+5
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsLibravatar Johannes Schindelin1-0/+4
2006-12-12Merge branch 'master' into js/mergeLibravatar Junio C Hamano1-1/+2
2006-12-05xdl_merge(): fix and simplify conflict handlingLibravatar Johannes Schindelin1-16/+5
2006-12-04diff -b: ignore whitespace at end of lineLibravatar Johannes Schindelin1-1/+2
2006-12-02xdl_merge(): fix thinkoLibravatar Johannes Schindelin1-2/+2
2006-12-02xdl_merge(): fix an off-by-one bugLibravatar Johannes Schindelin1-5/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 14:35:04 +0000