summaryrefslogtreecommitdiff
path: root/xdiff/xdiff.h
Commit message (Expand)AuthorAgeFilesLines
* xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanupJunio C Hamano2012-02-191-1/+4
* xdiff: remove XDL_PATCH_* macrosJunio C Hamano2012-02-191-5/+0
* diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-101-0/+1
* xdiff: do away with xdl_mmfile_next()Tay Ray Chuan2011-08-031-1/+0
* teach --histogram to diffTay Ray Chuan2011-07-121-0/+1
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-201-2/+3
* xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2010-03-201-0/+1
* refactor merge flags into xmparam_tBert Wesarg2010-03-021-6/+5
* make union merge an xdl merge favorBert Wesarg2010-03-021-0/+1
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-201-1/+8
|\
| * xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-161-0/+3
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-161-1/+5
* | git-merge-file --ours, --theirsJunio C Hamano2009-11-291-1/+7
|/
* Merge branch 'js/patience-diff'Junio C Hamano2009-01-231-0/+1
|\
| * Implement the patience diff algorithmJohannes Schindelin2009-01-071-0/+1
* | diff: add option to show context between close hunksRené Scharfe2008-12-291-0/+1
|/
* Allow alternate "low-level" emit function from xdl_diffBrian Downing2008-10-251-0/+1
* xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-301-0/+6
* xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-181-0/+1
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-061-0/+4
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* teach diff machinery about --ignore-space-at-eolJohannes Schindelin2007-02-131-1/+2
* xdiff: add xdl_merge()Johannes Schindelin2006-12-021-0/+7
* xdiff: generate "anti-diffs" aka what is common to two filesLinus Torvalds2006-06-281-0/+1
* Teach diff about -b and -w flagsJohannes Schindelin2006-06-231-0/+3
* xdiff: Show function names in hunk headers.Mark Wooding2006-03-271-0/+3
* Use a *real* built-in diff generatorLinus Torvalds2006-03-251-0/+91
View Lorry Controller Status