tests/test-diffdir.out
author Matt Mackall <mpm@selenic.com>
Mon, 16 Apr 2007 12:37:30 -0500
changeset 4355 10edaed7f909
parent 4180 f80cf8b7bbd9
child 6228 c0c4c7b1e8d3
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!