summaryrefslogtreecommitdiff
path: root/xdiff/xdiff.h
AgeCommit message (Expand)Author
2012-05-09xdiff: add hunk_func()René Scharfe
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano
2012-02-19xdiff: remove XDL_PATCH_* macrosJunio C Hamano
2011-10-10diff: add option to show whole functions as contextRené Scharfe
2011-08-03xdiff: do away with xdl_mmfile_next()Tay Ray Chuan
2011-07-12teach --histogram to diffTay Ray Chuan
2010-03-21xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder
2010-03-21xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder
2010-03-02refactor merge flags into xmparam_tBert Wesarg
2010-03-02make union merge an xdl merge favorBert Wesarg
2010-01-21Merge branch 'jc/conflict-marker-size'Junio C Hamano
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-11-30git-merge-file --ours, --theirsJunio 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