aboutsummaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAge
* 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
|/
* Increase length of function name bufferAndy Parkins2006-11-23
* xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of linesPetr Baudis2006-10-25
* xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.Jim Meyering2006-10-23
* Merge branch 'maint'Junio C Hamano2006-10-16
|\
| * Fix hash function in xdiff libraryv1.4.2.4Linus Torvalds2006-10-16
* | diff: fix 2 whitespace issuesJohannes Schindelin2006-10-12
|/
* Merge branch 'lt/merge-tree'Junio C Hamano2006-07-12
|\
| * xdiff: generate "anti-diffs" aka what is common to two filesLinus Torvalds2006-06-28
* | Fix more typos, primarily in the codePavel Roskin2006-07-10
|/
* Teach diff about -b and -w flagsJohannes Schindelin2006-06-23
* xdiff: minor changes to match libxdiff-0.21Junio C Hamano2006-06-19
* xdiff: post-process hunks to make them consistent.Davide Libenzi2006-04-13
* xdiff/xdiffi.c: fix warnings about possibly uninitialized variablesMarco Roeland2006-04-08
* Clean-up trivially redundant diff.Davide Libenzi2006-04-04
* xdiff: Show function names in hunk headers.Mark Wooding2006-03-27
* built-in diff: minimum tweaksJunio C Hamano2006-03-25
* builtin-diff: \No newline at end of file.Linus Torvalds2006-03-25
* Use a *real* built-in diff generatorLinus Torvalds2006-03-25