##// END OF EJS Templates
keyword: mimic cmdutil.bail_if_changed even more...
keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message

File last commit:

r5863:3d1f9dce default
r6672:6004eedb default
Show More
test-diff-newlines.out
8 lines | 196 B | text/plain | TextLexer
/ tests / test-diff-newlines.out
adding a
diff -r 107ba6f817b5 -r 310ce7989cdc a
--- a/a Thu Jan 01 00:00:01 1970 +0000
+++ b/a Thu Jan 01 00:00:02 1970 +0000
@@ -1,2 +1,3 @@
confuse str.splitlines
embedded newline
+clean diff