Separate the raw diff and patch with a newline

[git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 011bb8d..5f6048b 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -868,6 +868,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
                                        header = NULL;
                        }
                        opt->output_format = saved_format;
+                       putchar(opt->line_termination);
                }
                for (p = paths; p; p = p->next) {
                        if (show_combined_diff(p, num_parent, dense,