tests/test-diffdir.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 05 May 2006 10:45:08 -0700
changeset 2214 6c6c0e5595a2
parent 1933 7544700fd931
child 3825 000d122071b5
permissions -rw-r--r--
make test-confused-revert check working dir with two parents.

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