tests/test-diffdir.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 11 Aug 2007 13:35:25 +0200
changeset 5148 a04694e08775
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
merge with crew-stable

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!