aboutsummaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAge
* xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder2010-10-06
* xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid2010-07-05
* xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin2010-05-01
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-20
* xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2010-03-20
* refactor merge flags into xmparam_tBert Wesarg2010-03-02
* make union merge an xdl merge favorBert Wesarg2010-03-02
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-20
|\
| * xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-16
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
* | git-merge-file --ours, --theirsJunio C Hamano2009-11-29
|/
* Merge branch 'tf/diff-whitespace-incomplete-line'Junio C Hamano2009-08-31
|\
| * xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano2009-08-23
| * xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano2009-08-23
| * Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano2009-02-05
| |\
* | | refactor: use bitsizeof() instead of 8 * sizeof()Pierre Habouzit2009-07-22
* | | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2009-06-02
|\ \ \
| * | | Change xdl_merge to generate output even for null mergesCharles Bailey2009-05-24
* | | | Fix typos / spelling in commentsMike Ralphson2009-04-22
* | | | Fix various dead stores found by the clang static analyzerBenjamin Kramer2009-03-15
* | | | Merge branch 'js/patience-diff'Junio C Hamano2009-01-23
|\ \ \ \
| * | | | Implement the patience diff algorithmJohannes Schindelin2009-01-07
| | |/ / | |/| |
* | | | Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano2009-01-21
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix combined use of whitespace ignore options to diffKeith Cascio2009-01-19
| | |/ | |/|
| * | xdiff: give up scanning similar lines earlyDavide Libenzi2008-12-02
* | | diff: add option to show context between close hunksRené Scharfe2008-12-29
| |/ |/|
* | Merge branch 'dl/xdiff'Junio C Hamano2008-11-12
|\ \
| * | xdiff: give up scanning similar lines earlyDavide Libenzi2008-11-08
* | | Allow alternate "low-level" emit function from xdl_diffBrian Downing2008-10-25
|/ /
* | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-30
* | xmerge.c: minimum readability fixupsJunio C Hamano2008-08-30
* | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
* | xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano2008-08-30
|/
* xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-18
* xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin2008-02-18
* Remove unreachable statementsGuido Ostkamp2007-11-15
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-06
* Missing statics.Pierre Habouzit2007-06-08
* War on whitespaceJunio C Hamano2007-06-07
* xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingJohannes Schindelin2007-03-19
* teach diff machinery about --ignore-space-at-eolJohannes Schindelin2007-02-13
* Fix yet another subtle xdl_merge() bugJohannes Schindelin2006-12-30
* xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin2006-12-28
* Merge branch 'master' into js/mergeJunio C Hamano2006-12-12
|\
| * diff -b: ignore whitespace at end of lineJohannes Schindelin2006-12-04
* | xdl_merge(): fix and simplify conflict handlingJohannes Schindelin2006-12-05
* | xdl_merge(): fix thinkoJohannes Schindelin2006-12-02
* | xdl_merge(): fix an off-by-one bugJohannes Schindelin2006-12-02
* | xmerge: make return value from xdl_merge() more usable.Junio C Hamano2006-12-02
* | xdiff: add xdl_merge()Johannes Schindelin2006-12-02
|/
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 09:57:17 +0000