mirror of
https://github.com/git/git.git
synced 2024-05-24 11:56:10 +02:00
15980deab9
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> |
||
|---|---|---|
| .. | ||
| 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 | ||