summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-11 11:08:30 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-11 11:08:30 -0700
commitd9b983fc268bd749c947bcf88b977dc24782353b (patch)
treeed226b9150f4e365749352cb092858e5d86061c0 /diff.c
parentffb13460cd15c0b90b7adacfbe4448d4d5387f5e (diff)
parent35e2d03c2c24462717d774cd9f4eea46f1474ba1 (diff)
downloadgit-d9b983fc268bd749c947bcf88b977dc24782353b.tar.gz
Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11
* ab/diff-write-incomplete-line: Fix '\ No newline...' annotation in rewrite diffs
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 37bf002700..f1b044780f 100644
--- a/diff.c
+++ b/diff.c
@@ -574,6 +574,7 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
if (!endp) {
const char *plain = diff_get_color(ecb->color_diff,
DIFF_PLAIN);
+ putc('\n', ecb->opt->file);
emit_line_0(ecb->opt, plain, reset, '\\',
nneof, strlen(nneof));
}