aboutsummaryrefslogtreecommitdiff
path: root/xdiff/xdiff.h
Commit message (Expand)AuthorAge
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-20
|\
| * xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-16
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
* | git-merge-file --ours, --theirsJunio C Hamano2009-11-29
|/
* Merge branch 'js/patience-diff'Junio C Hamano2009-01-23
|\
| * Implement the patience diff algorithmJohannes Schindelin2009-01-07
* | diff: add option to show context between close hunksRené Scharfe2008-12-29
|/
* Allow alternate "low-level" emit function from xdl_diffBrian Downing2008-10-25
* xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
* xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-18
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-06
* War on whitespaceJunio C Hamano2007-06-07
* teach diff machinery about --ignore-space-at-eolJohannes Schindelin2007-02-13
* xdiff: add xdl_merge()Johannes Schindelin2006-12-02
* xdiff: generate "anti-diffs" aka what is common to two filesLinus Torvalds2006-06-28
* Teach diff about -b and -w flagsJohannes Schindelin2006-06-23
* xdiff: Show function names in hunk headers.Mark Wooding2006-03-27
* Use a *real* built-in diff generatorLinus Torvalds2006-03-25