diff options
| author | Petr Baudis <pasky@suse.cz> | 2006-04-11 11:30:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-11 18:17:50 (GMT) |
| commit | 90c1b08c7dc5be890e697237f67a188da235ffc8 (patch) | |
| tree | 3729cafeb8821a004fc3de1c398e1e2ca0b046e3 /combine-diff.c | |
| parent | 5c91da25d7da304d98c8808968f474f9fb7ac4db (diff) | |
| download | git-90c1b08c7dc5be890e697237f67a188da235ffc8.zip git-90c1b08c7dc5be890e697237f67a188da235ffc8.tar.gz git-90c1b08c7dc5be890e697237f67a188da235ffc8.tar.bz2 | |
Separate the raw diff and patch with a newline
More friendly for human reading I believe, and possibly friendlier to some
parsers (although only by an epsilon).
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index 011bb8d..5f6048b 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, |