tests/test-diffdir.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 18:28:50 -0500
changeset 3113 f96c8e219865
parent 1933 7544700fd931
child 3822 000d122071b5
permissions -rw-r--r--
merge: remove no longer possible clause

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