tests/test-diffdir.out
author Brendan Cully <brendan@kublai.com>
Fri, 22 Dec 2006 16:29:35 -0800
changeset 3953 a8eb050c6489
parent 3822 000d122071b5
child 4167 4574a8cb080f
permissions -rw-r--r--
Make test-manifest-merging less likely to delete the whole filesystem

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!