diff options
| -rw-r--r-- | combine-diff.c | 1 | ||||
| -rw-r--r-- | diff.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index 011bb8db2..5f6048b39 100644 --- 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, @@ -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]; |