git/xdiff
Junio C Hamano 4ed38637ec Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'
"git diff -W" output needs to extend the context backward to
include the header line of the current function and also forward to
include the body of the entire current function up to the header
line of the next one.  This process may have to merge to adjacent
hunks, but the code forgot to do so in some cases.

* rs/xdiff-merge-overlapping-hunks-for-W-context:
  xdiff: fix merging of hunks with -W context and -u context
2016-09-21 15:15:26 -07:00
..
xdiff.h Merge branch 'jk/diff-compact-heuristic' 2016-05-06 14:45:46 -07:00
xdiffi.c xdiff: implement empty line chunk heuristic 2016-04-19 10:53:34 -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