##// END OF EJS Templates
diffstat: don't fail on merges...
diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>

File last commit:

r5863:3d1f9dce default
r7664:3cc74ee7 default
Show More
test-diff-newlines.out
8 lines | 196 B | text/plain | TextLexer
/ tests / test-diff-newlines.out
Vadim Gelfer
fix diffs containing embedded "\r"....
r2248 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
Matt Mackall
diff: don't show function name by default...
r5863 @@ -1,2 +1,3 @@
Vadim Gelfer
fix diffs containing embedded "\r"....
r2248 confuse str.splitlines
embedded newline
+clean diff