tests/test-diffdir.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 11 Jan 2007 23:13:32 +0100
changeset 4022 bf329bda51a6
parent 3822 000d122071b5
child 4167 4574a8cb080f
permissions -rw-r--r--
Merge branchname changes in localrepo.commit.

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!