tests/test-diff-newlines.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 08 Sep 2006 02:16:16 +0200
changeset 3071 547d1a4aa105
parent 2248 b914f0557832
child 5863 3d1f9dcecdea
permissions -rw-r--r--
hg merge: fix lookup of branch add some tests for branch usage

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