Merge branch 'jc/combine' into next

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 99d76d01e3c0b14e96742292addf4d121afb6ab7..a14e6644ca9a39d0a0e1702ccefadf7a5bb64081 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1322,6 +1322,7 @@ void diff_flush(struct diff_options *options)
                        struct diff_filepair *p = q->queue[i];
                        flush_one_pair(p, DIFF_FORMAT_RAW, options);
                }
+               putchar(options->line_termination);
        }
        for (i = 0; i < q->nr; i++) {
                struct diff_filepair *p = q->queue[i];