| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
|/ |
|
* | Increase length of function name buffer | Andy Parkins | 2006-11-23 | 1 | -1/+1 |
* | xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines | Petr Baudis | 2006-10-25 | 1 | -2/+1 |
* | xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header. | Jim Meyering | 2006-10-23 | 1 | -1/+1 |
* | Merge branch 'maint' | Junio C Hamano | 2006-10-16 | 1 | -2/+3 |
|\ |
|
| * | Fix hash function in xdiff libraryv1.4.2.4 | Linus Torvalds | 2006-10-16 | 1 | -2/+3 |
* | | diff: fix 2 whitespace issues | Johannes Schindelin | 2006-10-12 | 1 | -17/+12 |
|/ |
|
* | Merge branch 'lt/merge-tree' | Junio C Hamano | 2006-07-12 | 2 | -0/+19 |
|\ |
|
| * | xdiff: generate "anti-diffs" aka what is common to two files | Linus Torvalds | 2006-06-28 | 2 | -0/+19 |
* | | Fix more typos, primarily in the code | Pavel Roskin | 2006-07-10 | 1 | -3/+3 |
|/ |
|
* | Teach diff about -b and -w flags | Johannes Schindelin | 2006-06-23 | 7 | -16/+71 |
* | xdiff: minor changes to match libxdiff-0.21 | Junio C Hamano | 2006-06-19 | 2 | -7/+5 |
* | xdiff: post-process hunks to make them consistent. | Davide Libenzi | 2006-04-13 | 2 | -5/+110 |
* | xdiff/xdiffi.c: fix warnings about possibly uninitialized variables | Marco Roeland | 2006-04-08 | 1 | -2/+3 |
* | Clean-up trivially redundant diff. | Davide Libenzi | 2006-04-04 | 4 | -25/+63 |
* | xdiff: Show function names in hunk headers. | Mark Wooding | 2006-03-27 | 5 | -5/+58 |
* | built-in diff: minimum tweaks | Junio C Hamano | 2006-03-25 | 1 | -6/+10 |
* | builtin-diff: \No newline at end of file. | Linus Torvalds | 2006-03-25 | 1 | -2/+10 |
* | Use a *real* built-in diff generator | Linus Torvalds | 2006-03-25 | 12 | -0/+1738 |