summaryrefslogtreecommitdiff
path: root/xdiff/xdiff.h
AgeCommit message (Expand)AuthorFilesLines
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()Libravatar René Scharfe1-1/+0
2012-05-09xdiff: add hunk_func()Libravatar René Scharfe1-0/+5
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsLibravatar Junio C Hamano1-1/+4
2012-02-19xdiff: remove XDL_PATCH_* macrosLibravatar Junio C Hamano1-5/+0
2011-10-10diff: add option to show whole functions as contextLibravatar René Scharfe1-0/+1
2011-08-03xdiff: do away with xdl_mmfile_next()Libravatar Tay Ray Chuan1-1/+0
2011-07-12teach --histogram to diffLibravatar Tay Ray Chuan1-0/+1
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureLibravatar Jonathan Nieder1-2/+3
2010-03-20xdl_merge(): add optional ancestor label to diff3-style outputLibravatar Jonathan Nieder1-0/+1
2010-03-02refactor merge flags into xmparam_tLibravatar Bert Wesarg1-6/+5
2010-03-02make union merge an xdl merge favorLibravatar Bert Wesarg1-0/+1
2010-01-20Merge branch 'jc/conflict-marker-size'Libravatar Junio C Hamano1-1/+8
2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tLibravatar Junio C Hamano1-0/+3
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersLibravatar Junio C Hamano1-1/+5
2009-11-29git-merge-file --ours, --theirsLibravatar Junio C Hamano1-1/+7
2009-01-23Merge branch 'js/patience-diff'Libravatar Junio C Hamano1-0/+1
2009-01-07Implement the patience diff algorithmLibravatar Johannes Schindelin1-0/+1
2008-12-29diff: add option to show context between close hunksLibravatar René Scharfe1-0/+1
2008-10-25Allow alternate "low-level" emit function from xdl_diffLibravatar Brian Downing1-0/+1
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleLibravatar Junio C Hamano1-0/+6
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMLibravatar Johannes Schindelin1-0/+1
2007-07-06Per-path attribute based hunk header selection.Libravatar Junio C Hamano1-0/+4
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-02-13teach diff machinery about --ignore-space-at-eolLibravatar Johannes Schindelin1-1/+2
2006-12-02xdiff: add xdl_merge()Libravatar Johannes Schindelin1-0/+7
2006-06-28xdiff: generate "anti-diffs" aka what is common to two filesLibravatar Linus Torvalds1-0/+1
2006-06-23Teach diff about -b and -w flagsLibravatar Johannes Schindelin1-0/+3
2006-03-27xdiff: Show function names in hunk headers.Libravatar Mark Wooding1-0/+3
2006-03-25Use a *real* built-in diff generatorLibravatar Linus Torvalds1-0/+91
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 09:33:02 +0000