##// END OF EJS Templates
change tests to use simplemerge by default
change tests to use simplemerge by default

File last commit:

r2248:b914f055 default
r4365:46280c00 default
Show More
test-diff-newlines.out
8 lines | 219 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
confuse str.splitlines
embedded newline
+clean diff