tests/test-diffdir.out
author Patrick Mezard <pmezard@gmail.com>
Fri, 14 Sep 2007 23:10:41 +0200
changeset 5308 9400d677efc7
parent 4180 f80cf8b7bbd9
child 6228 c0c4c7b1e8d3
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!