tests/test-diffdir.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 20 May 2007 19:32:22 +0200
changeset 4449 7eb604da8764
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
Merge with crew-stable.

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!