tests/test-diffdir.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 17 May 2009 23:07:23 +0200
changeset 8490 ea1981f65b3a
parent 6228 c0c4c7b1e8d3
permissions -rw-r--r--
merge with crew

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: 00changelog.i@: ambiguous identifier!
abort: 00changelog.i@: ambiguous identifier!