tests/test-diffdir.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 30 Jan 2007 19:09:08 -0200
changeset 4058 e7282dede8cd
parent 3822 000d122071b5
child 4167 4574a8cb080f
permissions -rw-r--r--
filecommit: don't forget the local parent on a merge with a local rename

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!