tests/test-diffdir.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 04 Jun 2007 00:26:53 -0300
changeset 4497 22ebd6ee5672
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!