summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)Author
2009-08-23xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano
2009-02-06Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano
2009-01-20Fix combined use of whitespace ignore options to diffKeith Cascio
2008-12-03xdiff: give up scanning similar lines earlyDavide Libenzi
2008-11-13Merge branch 'dl/xdiff'Junio C Hamano
2008-11-08xdiff: give up scanning similar lines earlyDavide Libenzi
2008-10-25Allow alternate "low-level" emit function from xdl_diffBrian Downing
2008-08-31xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano
2008-08-31xmerge.c: minimum readability fixupsJunio C Hamano
2008-08-31xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano
2008-08-31xdl_fill_merge_buffer(): separate out a too deeply nested functionJunio C Hamano
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin
2007-11-16Remove unreachable statementsGuido Ostkamp
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano
2007-06-08Missing statics.Pierre Habouzit
2007-06-07War on whitespaceJunio C Hamano
2007-03-20xdiff/xutils.c(xdl_hash_record): factor out whitespace handlingJohannes Schindelin
2007-02-14teach diff machinery about --ignore-space-at-eolJohannes Schindelin
2006-12-31Fix yet another subtle xdl_merge() bugJohannes Schindelin
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin
2006-12-13Merge branch 'master' into js/mergeJunio C Hamano
2006-12-05xdl_merge(): fix and simplify conflict handlingJohannes Schindelin
2006-12-05diff -b: ignore whitespace at end of lineJohannes Schindelin
2006-12-03xdl_merge(): fix thinkoJohannes Schindelin
2006-12-03xdl_merge(): fix an off-by-one bugJohannes Schindelin
2006-12-03xmerge: make return value from xdl_merge() more usable.Junio C Hamano
2006-12-03xdiff: add xdl_merge()Johannes Schindelin
2006-11-24Increase length of function name bufferAndy Parkins
2006-10-25xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of linesPetr Baudis
2006-10-23xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.Jim Meyering
2006-10-17Merge branch 'maint'Junio C Hamano
2006-10-17Fix hash function in xdiff libraryv1.4.2.4Linus Torvalds
2006-10-12diff: fix 2 whitespace issuesJohannes Schindelin
2006-07-13Merge branch 'lt/merge-tree'Junio C Hamano
2006-07-10Fix more typos, primarily in the codePavel Roskin
2006-06-29xdiff: generate "anti-diffs" aka what is common to two filesLinus Torvalds
2006-06-24Teach diff about -b and -w flagsJohannes Schindelin
2006-06-20xdiff: minor changes to match libxdiff-0.21Junio C Hamano
2006-04-13xdiff: post-process hunks to make them consistent.Davide Libenzi
2006-04-09xdiff/xdiffi.c: fix warnings about possibly uninitialized variablesMarco Roeland
2006-04-04Clean-up trivially redundant diff.Davide Libenzi
2006-03-28xdiff: Show function names in hunk headers.Mark Wooding
2006-03-26built-in diff: minimum tweaksJunio C Hamano
2006-03-26builtin-diff: \No newline at end of file.Linus Torvalds
2006-03-26Use a *real* built-in diff generatorLinus Torvalds