summaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAgeFilesLines
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-062-14/+27
* Missing statics.Pierre Habouzit2007-06-081-2/+2
* War on whitespaceJunio C Hamano2007-06-0712-12/+0
* xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingJohannes Schindelin2007-03-191-2/+20
* teach diff machinery about --ignore-space-at-eolJohannes Schindelin2007-02-132-1/+26
* Fix yet another subtle xdl_merge() bugJohannes Schindelin2006-12-301-2/+5
* xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin2006-12-281-0/+4
* Merge branch 'master' into js/mergeJunio C Hamano2006-12-121-1/+2
|\
| * diff -b: ignore whitespace at end of lineJohannes Schindelin2006-12-041-1/+2
* | xdl_merge(): fix and simplify conflict handlingJohannes Schindelin2006-12-051-16/+5
* | xdl_merge(): fix thinkoJohannes Schindelin2006-12-021-2/+2
* | xdl_merge(): fix an off-by-one bugJohannes Schindelin2006-12-021-5/+5
* | xmerge: make return value from xdl_merge() more usable.Junio C Hamano2006-12-021-10/+7
* | xdiff: add xdl_merge()Johannes Schindelin2006-12-024-2/+442
|/
* Increase length of function name bufferAndy Parkins2006-11-231-1/+1
* xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of linesPetr Baudis2006-10-251-2/+1
* xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.Jim Meyering2006-10-231-1/+1
* Merge branch 'maint'Junio C Hamano2006-10-161-2/+3
|\
| * Fix hash function in xdiff libraryv1.4.2.4Linus Torvalds2006-10-161-2/+3
* | diff: fix 2 whitespace issuesJohannes Schindelin2006-10-121-17/+12
|/
* Merge branch 'lt/merge-tree'Junio C Hamano2006-07-122-0/+19
|\
| * xdiff: generate "anti-diffs" aka what is common to two filesLinus Torvalds2006-06-282-0/+19
* | Fix more typos, primarily in the codePavel Roskin2006-07-101-3/+3
|/
* Teach diff about -b and -w flagsJohannes Schindelin2006-06-237-16/+71
* xdiff: minor changes to match libxdiff-0.21Junio C Hamano2006-06-192-7/+5
* xdiff: post-process hunks to make them consistent.Davide Libenzi2006-04-132-5/+110
* xdiff/xdiffi.c: fix warnings about possibly uninitialized variablesMarco Roeland2006-04-081-2/+3
* Clean-up trivially redundant diff.Davide Libenzi2006-04-044-25/+63
* xdiff: Show function names in hunk headers.Mark Wooding2006-03-275-5/+58
* built-in diff: minimum tweaksJunio C Hamano2006-03-251-6/+10
* builtin-diff: \No newline at end of file.Linus Torvalds2006-03-251-2/+10
* Use a *real* built-in diff generatorLinus Torvalds2006-03-2512-0/+1738
View Lorry Controller Status