1
0
mirror of https://github.com/git/git.git synced 2024-09-30 16:01:40 +02:00
git/xdiff
Junio C Hamano d15c05a5d0 Merge branch 'rs/xdiff-hunk-with-func-line'
"git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.

* rs/xdiff-hunk-with-func-line:
  xdiff: fix merging of appended hunk with -W
  grep: -W: don't extend context to trailing empty lines
  t7810: add test for grep -W and trailing empty context lines
  xdiff: don't trim common tail with -W
  xdiff: -W: don't include common trailing empty lines in context
  xdiff: ignore empty lines before added functions with -W
  xdiff: handle appended chunks better with -W
  xdiff: factor out match_func_rec()
  t4051: rewrite, add more tests
2016-06-20 11:01:04 -07:00
..
xdiff.h
xdiffi.c
xdiffi.h
xemit.c
xemit.h
xhistogram.c
xinclude.h
xmacros.h
xmerge.c
xpatience.c
xprepare.c
xprepare.h
xtypes.h
xutils.c
xutils.h