Junio C Hamano f2cfb8fcc9 Merge branch 'js/ignore-space-at-eol' ...

An age old bug that caused "git diff --ignore-space-at-eol"
misbehave has been fixed.

* js/ignore-space-at-eol:
  diff: fix a double off-by-one with --ignore-space-at-eol
  diff: demonstrate a bug with --patience and --ignore-space-at-eol

2016-07-25 14:13:35 -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

…

xemit.c

xdiff: fix merging of appended hunk with -W

2016-06-09 15:27:26 -07:00

xemit.h

…

xhistogram.c

…

xinclude.h

…

xmacros.h

…

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

…