summaryrefslogtreecommitdiff
path: root/xdiff/xdiff.h
AgeCommit message (Expand)Author
2010-01-17xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano
2010-01-17xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano
2009-01-24Merge branch 'js/patience-diff'Junio C Hamano
2009-01-07Implement the patience diff algorithmJohannes Schindelin
2008-12-29diff: add option to show context between close hunksRené Scharfe
2008-10-25Allow alternate "low-level" emit function from xdl_diffBrian Downing
2008-08-31xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano
2007-06-07War on whitespaceJunio C Hamano
2007-02-14teach diff machinery about --ignore-space-at-eolJohannes Schindelin
2006-12-03xdiff: add xdl_merge()Johannes Schindelin
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-03-28xdiff: Show function names in hunk headers.Mark Wooding
2006-03-26Use a *real* built-in diff generatorLinus Torvalds