tests/test-diffdir.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 27 Mar 2007 01:41:18 -0300
changeset 4295 a74586023196
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
test-merge6: avoid a shell script

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!