tests/test-diffdir.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 19 Jun 2007 08:51:34 +0200
changeset 4635 63b9d2deed48
parent 4208 f80cf8b7bbd9
permissions -rw-r--r--
Updated copyright notices and add "and others" to "hg version"

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!