tests/test-diffdir.out
author Brendan Cully <brendan@kublai.com>
Thu, 09 Aug 2007 11:37:47 -0700
changeset 5131 3edd6fedc33a
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!