tests/test-diffdir.out
author Bryan O'Sullivan <bos@serpentine.com>
Sat, 02 Jun 2007 09:04:23 -0700
changeset 4488 649dd2492ae5
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
Merge with crew.

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!