Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 37bf00270023d6f65084508ee711a21430b10371..f1b044780ffb0e590f8dd1d609ae2b2c3b54b473 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -574,6 +574,7 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
        if (!endp) {
                const char *plain = diff_get_color(ecb->color_diff,
                                                   DIFF_PLAIN);
+               putc('\n', ecb->opt->file);
                emit_line_0(ecb->opt, plain, reset, '\\',
                            nneof, strlen(nneof));
        }