aboutsummaryrefslogtreecommitdiffstats
path: root/xdiff (follow)
AgeCommit message (Expand)AuthorFilesLines
2008-08-30xmerge.c: minimum readability fixupsJunio C Hamano1-7/+7
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2-19/+90
2008-08-30xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano1-51/+70
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2-4/+28
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin1-1/+46
2007-11-15Remove unreachable statementsGuido Ostkamp2-4/+0
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano2-14/+27
2007-06-08Missing statics.Pierre Habouzit1-2/+2
2007-06-07War on whitespaceJunio C Hamano12-12/+0
2007-03-19xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingJohannes Schindelin1-2/+20
2007-02-13teach diff machinery about --ignore-space-at-eolJohannes Schindelin2-1/+26
2006-12-30Fix yet another subtle xdl_merge() bugJohannes Schindelin1-2/+5
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin1-0/+4
2006-12-12Merge branch 'master' into js/mergeJunio C Hamano1-1/+2
2006-12-05xdl_merge(): fix and simplify conflict handlingJohannes Schindelin1-16/+5
2006-12-04diff -b: ignore whitespace at end of lineJohannes Schindelin1-1/+2
2006-12-02xdl_merge(): fix thinkoJohannes Schindelin1-2/+2
2006-12-02xdl_merge(): fix an off-by-one bugJohannes Schindelin1-5/+5
2006-12-02xmerge: make return value from xdl_merge() more usable.Junio C Hamano1-10/+7
2006-12-02xdiff: add xdl_merge()Johannes Schindelin4-2/+442
2006-11-23Increase length of function name bufferAndy Parkins1-1/+1
2006-10-25xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of linesPetr Baudis1-2/+1
2006-10-23xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.Jim Meyering1-1/+1
2006-10-16Merge branch 'maint'Junio C Hamano1-2/+3
2006-10-16Fix hash function in xdiff libraryv1.4.2.4Linus Torvalds1-2/+3
2006-10-12diff: fix 2 whitespace issuesJohannes Schindelin1-17/+12
2006-07-12Merge branch 'lt/merge-tree'Junio C Hamano2-0/+19
2006-07-10Fix more typos, primarily in the codePavel Roskin1-3/+3
2006-06-28xdiff: generate "anti-diffs" aka what is common to two filesLinus Torvalds2-0/+19
2006-06-23Teach diff about -b and -w flagsJohannes Schindelin7-16/+71
2006-06-19xdiff: minor changes to match libxdiff-0.21Junio C Hamano2-7/+5
2006-04-13xdiff: post-process hunks to make them consistent.Davide Libenzi2-5/+110
2006-04-08xdiff/xdiffi.c: fix warnings about possibly uninitialized variablesMarco Roeland1-2/+3
2006-04-04Clean-up trivially redundant diff.Davide Libenzi4-25/+63
2006-03-27xdiff: Show function names in hunk headers.Mark Wooding5-5/+58
2006-03-25built-in diff: minimum tweaksJunio C Hamano1-6/+10
2006-03-25builtin-diff: \No newline at end of file.Linus Torvalds1-2/+10
2006-03-25Use a *real* built-in diff generatorLinus Torvalds12-0/+1738
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-04 20:32:16 +0000