tests/test-diffdir.out
author Brendan Cully <brendan@kublai.com>
Wed, 14 Mar 2007 10:45:18 -0700
changeset 4210 6cb5be6bd70f
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
mq: add qparent tag (first parent of qbase)

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!