tests/test-diffdir.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 04 Jan 2008 07:44:07 +0100
changeset 5795 520a8d9d92ed
parent 4180 f80cf8b7bbd9
child 6228 c0c4c7b1e8d3
permissions -rw-r--r--
merge with main

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!