tests/test-diffdir.out
author Matt Mackall <mpm@selenic.com>
Tue, 13 Mar 2007 18:53:23 -0500
changeset 4208 f80cf8b7bbd9
parent 4167 4574a8cb080f
permissions -rw-r--r--
Remove dummy branch hack from tests

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!