tests/test-diffdir.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 06 Feb 2007 15:54:58 -0200
changeset 4065 8ee983e3d461
parent 3822 000d122071b5
child 4167 4574a8cb080f
permissions -rw-r--r--
fix strip'ping the second parent of a merge

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!