summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Adam Butcher <dev.lists@jessamine.co.uk>2012-08-04 21:07:35 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-05 12:37:52 -0700
commit35e2d03c2c24462717d774cd9f4eea46f1474ba1 (patch)
tree79ff7fb51679d202ccbf17dbee8f833db0afd3b4 /git-mergetool--lib.sh
parenttests: Introduce test_seq (diff)
downloadtgif-35e2d03c2c24462717d774cd9f4eea46f1474ba1.tar.xz
Fix '\ No newline...' annotation in rewrite diffs
When a file that ends with an incomplete line is expressed as a complete rewrite with the -B option, git diff incorrectly appends the incomplete line indicator "\ No newline at end of file" after such a line, rather than writing it on a line of its own (the output codepath for normal output without -B does not have this problem). Add a LF after the incomplete line before writing the "\ No newline ..." out to fix this. Add a couple of tests to confirm that the indicator comment is generated on its own line in both plain diff and rewrite mode. Signed-off-by: Adam Butcher <dev.lists@jessamine.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions