| Commit message (Expand) | Author | Age | Files | Lines |
* | xdiff: cast arguments for ctype functions to unsigned char | Jonathan Nieder | 2010-10-06 | 3 | -10/+11 |
* | xdiff: optimise for no whitespace difference when ignoring whitespace. | Dylan Reid | 2010-07-05 | 1 | -1/+3 |
* | xdiff/xmerge.c: use memset() instead of explicit for-loop | Alexey Mahotkin | 2010-05-01 | 1 | -9/+8 |
* | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 2010-03-20 | 2 | -10/+14 |
* | xdl_merge(): add optional ancestor label to diff3-style output | Jonathan Nieder | 2010-03-20 | 2 | -2/+15 |
* | refactor merge flags into xmparam_t | Bert Wesarg | 2010-03-02 | 2 | -12/+11 |
* | make union merge an xdl merge favor | Bert Wesarg | 2010-03-02 | 2 | -7/+14 |
* | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 | 2 | -10/+25 |
|\ |
|
| * | xdl_merge(): allow passing down marker_size in xmparam_t | Junio C Hamano | 2010-01-16 | 2 | -8/+18 |
| * | xdl_merge(): introduce xmparam_t for merge specific parameters | Junio C Hamano | 2010-01-16 | 2 | -2/+7 |
* | | git-merge-file --ours, --theirs | Junio C Hamano | 2009-11-29 | 2 | -3/+14 |
|/ |
|
* | Merge branch 'tf/diff-whitespace-incomplete-line' | Junio C Hamano | 2009-08-31 | 1 | -33/+53 |
|\ |
|
| * | xutils: Fix xdl_recmatch() on incomplete lines | Junio C Hamano | 2009-08-23 | 1 | -31/+49 |
| * | xutils: Fix hashing an incomplete line with whitespaces at the end | Junio C Hamano | 2009-08-23 | 1 | -2/+4 |
| * | Merge branch 'kc/maint-diff-bwi-fix' into maint | Junio C Hamano | 2009-02-05 | 1 | -2/+4 |
| |\ |
|
* | | | refactor: use bitsizeof() instead of 8 * sizeof() | Pierre Habouzit | 2009-07-22 | 1 | -1/+1 |
* | | | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint | Junio C Hamano | 2009-06-02 | 1 | -16/+15 |
|\ \ \ |
|
| * | | | Change xdl_merge to generate output even for null merges | Charles Bailey | 2009-05-24 | 1 | -16/+15 |
* | | | | Fix typos / spelling in comments | Mike Ralphson | 2009-04-22 | 1 | -1/+1 |
* | | | | Fix various dead stores found by the clang static analyzer | Benjamin Kramer | 2009-03-15 | 2 | -4/+3 |
* | | | | Merge branch 'js/patience-diff' | Junio C Hamano | 2009-01-23 | 5 | -1/+389 |
|\ \ \ \ |
|
| * | | | | Implement the patience diff algorithm | Johannes Schindelin | 2009-01-07 | 5 | -1/+389 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'kc/maint-diff-bwi-fix' | Junio C Hamano | 2009-01-21 | 1 | -2/+4 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Fix combined use of whitespace ignore options to diff | Keith Cascio | 2009-01-19 | 1 | -2/+4 |
| | |/
| |/| |
|
| * | | xdiff: give up scanning similar lines early | Davide Libenzi | 2008-12-02 | 1 | -2/+13 |
* | | | diff: add option to show context between close hunks | René Scharfe | 2008-12-29 | 2 | -1/+3 |
| |/
|/| |
|
* | | Merge branch 'dl/xdiff' | Junio C Hamano | 2008-11-12 | 1 | -2/+13 |
|\ \ |
|
| * | | xdiff: give up scanning similar lines early | Davide Libenzi | 2008-11-08 | 1 | -2/+13 |
* | | | Allow alternate "low-level" emit function from xdl_diff | Brian Downing | 2008-10-25 | 4 | -3/+8 |
|/ / |
|
* | | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less | Junio C Hamano | 2008-08-30 | 1 | -0/+9 |
* | | xmerge.c: minimum readability fixups | Junio C Hamano | 2008-08-30 | 1 | -7/+7 |
* | | xdiff-merge: optionally show conflicts in "diff3 -m" style | Junio C Hamano | 2008-08-30 | 2 | -19/+90 |
* | | xdl_fill_merge_buffer(): separate out a too deeply nested function | Junio C Hamano | 2008-08-30 | 1 | -51/+70 |
|/ |
|
* | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin | 2008-02-18 | 2 | -4/+28 |
* | xdl_merge(): make XDL_MERGE_ZEALOUS output simpler | Johannes Schindelin | 2008-02-18 | 1 | -1/+46 |
* | Remove unreachable statements | Guido Ostkamp | 2007-11-15 | 2 | -4/+0 |
* | Per-path attribute based hunk header selection. | Junio C Hamano | 2007-07-06 | 2 | -14/+27 |
* | Missing statics. | Pierre Habouzit | 2007-06-08 | 1 | -2/+2 |
* | War on whitespace | Junio C Hamano | 2007-06-07 | 12 | -12/+0 |
* | xdiff/xutils.c(xdl_hash_record): factor out whitespace handling | Johannes Schindelin | 2007-03-19 | 1 | -2/+20 |
* | teach diff machinery about --ignore-space-at-eol | Johannes Schindelin | 2007-02-13 | 2 | -1/+26 |
* | Fix yet another subtle xdl_merge() bug | Johannes Schindelin | 2006-12-30 | 1 | -2/+5 |
* | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin | 2006-12-28 | 1 | -0/+4 |
* | Merge branch 'master' into js/merge | Junio C Hamano | 2006-12-12 | 1 | -1/+2 |
|\ |
|
| * | diff -b: ignore whitespace at end of line | Johannes Schindelin | 2006-12-04 | 1 | -1/+2 |
* | | xdl_merge(): fix and simplify conflict handling | Johannes Schindelin | 2006-12-05 | 1 | -16/+5 |
* | | xdl_merge(): fix thinko | Johannes Schindelin | 2006-12-02 | 1 | -2/+2 |
* | | xdl_merge(): fix an off-by-one bug | Johannes Schindelin | 2006-12-02 | 1 | -5/+5 |
* | | xmerge: make return value from xdl_merge() more usable. | Junio C Hamano | 2006-12-02 | 1 | -10/+7 |
* | | xdiff: add xdl_merge() | Johannes Schindelin | 2006-12-02 | 4 | -2/+442 |
|/ |
|