summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-11 11:52:01 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-11 11:52:01 -0700
commit55275b3812af3fe84516f176e589100232aef4f5 (patch)
treee6e31d8f35ccb7119737bf14c9621db12fad7d1d /diff.c
parent8fcd4218c63d15481d8fbb12c3fddfffa98e1adc (diff)
parent90c1b08c7dc5be890e697237f67a188da235ffc8 (diff)
downloadgit-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 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 99d76d01e3..a14e6644ca 100644
--- 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];