view tests/test-diffdir.out @ 5764:8a5d8fb59ed2

Backed out changeset c2a21fe60994 Unfortunately, this breaks backward compatibility.
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Dec 2007 17:47:02 -0600
parents f80cf8b7bbd9
children c0c4c7b1e8d3
line wrap: on
line source

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!