tests/test-diffdir.out
author Brendan Cully <brendan@kublai.com>
Mon, 13 Aug 2007 11:58:47 -0700
changeset 5154 ec24bfd852ab
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
imerge: simplify 1d5ebb0d366f

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!