tests/test-diffdir.out
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 14:03:48 -0500
changeset 5046 bf444a9a9c23
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
Merge with 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!