diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-11 11:52:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-11 11:52:01 -0700 |
| commit | 55275b3812af3fe84516f176e589100232aef4f5 (patch) | |
| tree | e6e31d8f35ccb7119737bf14c9621db12fad7d1d /combine-diff.c | |
| parent | 8fcd4218c63d15481d8fbb12c3fddfffa98e1adc (diff) | |
| parent | 90c1b08c7dc5be890e697237f67a188da235ffc8 (diff) | |
| download | git-55275b3812af3fe84516f176e589100232aef4f5.tar.gz | |
Merge branch 'jc/withraw' into next
* jc/withraw:
Separate the raw diff and patch with a newline
Document --patch-with-raw
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 011bb8db2d..5f6048b397 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, |