summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)AuthorFilesLines
2011-10-10xdiff: factor out get_func_line()Libravatar René Scharfe1-16/+27
2011-09-26Revert removal of multi-match discard heuristic in 27af01Libravatar René Scharfe1-3/+7
2011-09-06Merge branch 'rc/histogram-diff'Libravatar Junio C Hamano1-0/+2
2011-08-31xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()Libravatar Tay Ray Chuan1-0/+2
2011-08-17Merge branch 'rc/histogram-diff' into HEADLibravatar Junio C Hamano8-125/+470
2011-08-17xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Libravatar Tay Ray Chuan1-36/+50
2011-08-08xdiff/xhistogram: drop need for additional variableLibravatar Tay Ray Chuan1-5/+4
2011-08-08xdiff/xhistogram: rely on xdl_trim_ends()Libravatar Tay Ray Chuan1-27/+4
2011-08-08xdiff/xhistogram: rework handling of recursed resultsLibravatar Tay Ray Chuan1-6/+9
2011-08-03xdiff: do away with xdl_mmfile_next()Libravatar Tay Ray Chuan3-20/+2
2011-07-12xdiff/xprepare: use a smaller sample size for histogram diffLibravatar Tay Ray Chuan3-10/+17
2011-07-12xdiff/xprepare: skip classificationLibravatar Tay Ray Chuan1-8/+16
2011-07-12teach --histogram to diffLibravatar Tay Ray Chuan4-0/+390
2011-07-07xdiff/xpatience: factor out fall-back-diff functionLibravatar Tay Ray Chuan3-25/+35
2011-07-07xdiff/xprepare: refactor abort cleanupsLibravatar Tay Ray Chuan1-59/+32
2011-07-07xdiff/xprepare: use memset()Libravatar Tay Ray Chuan1-7/+3
2010-11-17Merge branch 'cb/diff-fname-optim'Libravatar 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 10:41:22 +0000