tests/test-diffdir.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 24 Dec 2006 22:28:01 +0100
changeset 3960 c137e21dba5a
parent 3822 000d122071b5
child 4167 4574a8cb080f
permissions -rw-r--r--
test-manifest-merging: we only need to remove files

diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r acd8075edac9 a
--- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
abort: Ambiguous identifier!
abort: Ambiguous identifier!