Johannes Schindelin 15980deab9 merge-file: ensure that conflict sections match eol style ...

In the previous patch, we made sure that the conflict markers themselves
match the end-of-line style of the input files. However, this still left
out the conflicting text itself: if it lacks a trailing newline, we
add one, and should add a carriage return when appropriate, too.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2016-01-27 10:21:53 -08:00

..

xdiff.h

diff: add --ignore-blank-lines option

2013-06-19 15:17:45 -07:00

xdiffi.c

diff: add --ignore-blank-lines option

2013-06-19 15:17:45 -07:00

xdiffi.h

diff: add --ignore-blank-lines option

2013-06-19 15:17:45 -07:00

xemit.c

C: have space around && and || operators

2013-10-16 10:26:39 -07:00

xemit.h

diff: add --ignore-blank-lines option

2013-06-19 15:17:45 -07:00

xhistogram.c

…

xinclude.h

…

xmacros.h

…

xmerge.c

merge-file: ensure that conflict sections match eol style

2016-01-27 10:21:53 -08:00

xpatience.c

…

xprepare.c

…

xprepare.h

…

xtypes.h

…

xutils.c

diff: add --ignore-blank-lines option

2013-06-19 15:17:45 -07:00

xutils.h

diff: add --ignore-blank-lines option

2013-06-19 15:17:45 -07:00