tests/test-diffdir.out
author Matt Mackall <mpm@selenic.com>
Tue, 12 Dec 2006 18:16:23 -0600
changeset 3885 1e0b94cfba0e
parent 3822 000d122071b5
child 4167 4574a8cb080f
permissions -rw-r--r--
Remove deprecated old-style branch support

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!