Junio C Hamano b7af6ae5cf Merge branch 'mh/diff-indent-heuristic' ... Output from "git diff" can be made easier to read by selecting which lines are common and which lines are added/deleted intelligently when the lines before and after the changed section are the same. A command line option is added to help with the experiment to find a good heuristics. * mh/diff-indent-heuristic: blame: honor the diff heuristic options and config parse-options: add parse_opt_unknown_cb() diff: improve positioning of add/delete blocks in diffs xdl_change_compact(): introduce the concept of a change group recs_match(): take two xrecord_t pointers as arguments is_blank_line(): take a single xrecord_t as argument xdl_change_compact(): only use heuristic if group can't be matched xdl_change_compact(): fix compaction heuristic to adjust ixo		2016-09-26 16:09:16 -07:00
..
xdiff.h	diff: improve positioning of add/delete blocks in diffs	2016-09-19 10:25:11 -07:00
xdiffi.c	diff: improve positioning of add/delete blocks in diffs	2016-09-19 10:25:11 -07:00
xdiffi.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xemit.c	Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'	2016-09-21 15:15:26 -07:00
xemit.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xhistogram.c	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
xinclude.h
xmacros.h	xdiff: cast arguments for ctype functions to unsigned char	2010-10-06 10:46:45 -07:00
xmerge.c	Merge branch 'ps/plug-xdl-merge-leak'	2016-02-26 13:37:22 -08:00
xpatience.c	diff: fix a double off-by-one with --ignore-space-at-eol	2016-07-11 11:55:53 -07:00
xprepare.c	xdiff/xprepare: fix a memory leak	2016-03-04 15:51:08 -08:00
xprepare.h
xtypes.h
xutils.c	diff: fix a double off-by-one with --ignore-space-at-eol	2016-07-11 11:55:53 -07:00
xutils.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00