summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)AuthorFilesLines
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsLibravatar Johannes Schindelin1-0/+4
2006-12-12Merge branch 'master' into js/mergeLibravatar Junio C Hamano1-1/+2
2006-12-05xdl_merge(): fix and simplify conflict handlingLibravatar Johannes Schindelin1-16/+5
2006-12-04diff -b: ignore whitespace at end of lineLibravatar Johannes Schindelin1-1/+2
2006-12-02xdl_merge(): fix thinkoLibravatar Johannes Schindelin1-2/+2
2006-12-02xdl_merge(): fix an off-by-one bugLibravatar Johannes Schindelin1-5/+5
2006-12-02xmerge: make return value from xdl_merge() more usable.Libravatar Junio C Hamano1-10/+7
2006-12-02xdiff: add xdl_merge()Libravatar Johannes Schindelin4-2/+442
2006-11-23Increase length of function name bufferLibravatar Andy Parkins1-1/+1
2006-10-25xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of linesLibravatar Petr Baudis1-2/+1
2006-10-23xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.Libravatar Jim Meyering1-1/+1
2006-10-16Merge branch 'maint'Libravatar Junio C Hamano1-2/+3
2006-10-16Fix hash function in xdiff libraryLibravatar Linus Torvalds1-2/+3
2006-10-12diff: fix 2 whitespace issuesLibravatar Johannes Schindelin1-17/+12
2006-07-12Merge branch 'lt/merge-tree'Libravatar Junio C Hamano2-0/+19
2006-07-10Fix more typos, primarily in the codeLibravatar Pavel Roskin1-3/+3
2006-06-28xdiff: generate "anti-diffs" aka what is common to two filesLibravatar Linus Torvalds2-0/+19
2006-06-23Teach diff about -b and -w flagsLibravatar Johannes Schindelin7-16/+71
2006-06-19xdiff: minor changes to match libxdiff-0.21Libravatar Junio C Hamano2-7/+5
2006-04-13xdiff: post-process hunks to make them consistent.Libravatar Davide Libenzi2-5/+110
2006-04-08xdiff/xdiffi.c: fix warnings about possibly uninitialized variablesLibravatar Marco Roeland1-2/+3
2006-04-04Clean-up trivially redundant diff.Libravatar Davide Libenzi4-25/+63
2006-03-27xdiff: Show function names in hunk headers.Libravatar Mark Wooding5-5/+58
2006-03-25built-in diff: minimum tweaksLibravatar Junio C Hamano1-6/+10
2006-03-25builtin-diff: \No newline at end of file.Libravatar Linus Torvalds1-2/+10
2006-03-25Use a *real* built-in diff generatorLibravatar Linus Torvalds12-0/+1738
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 04:10:44 +0000