tests/test-diff-newlines.out
author Matt Mackall <mpm@selenic.com>
Mon, 14 Jan 2008 16:28:32 -0600
changeset 5857 c704b03884ef
parent 2248 b914f0557832
child 5863 3d1f9dcecdea
permissions -rw-r--r--
merge: add a bit more sanity to divergent copy checks

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