diff options
| author |  Stefan Beller <sbeller@google.com> | 2017-09-27 15:51:26 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-09-28 13:15:59 +0900 |
| commit | 58aaced4442a6daae1c82318f3f9259001714505 (patch) | |
| tree | 07533df7a29931396385cc552eafe62cc2ef42d5 /git-merge-octopus.sh | |
| parent | diff: document the new --color-moved setting (diff) | |
| download | tgif-58aaced4442a6daae1c82318f3f9259001714505.tar.xz | |
diff: correct newline in summary for renamed files
In 146fdb0dfe (diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY,
2017-06-29), the conversion from direct printing to the symbol emission
dropped the new line character for renamed, copied and rewritten files.
Add the emission of a newline, add a test for this case.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions