tests/test-diffdir.out
author Matt Mackall <mpm@selenic.com>
Mon, 17 Jul 2006 11:30:33 -0500
changeset 2630 837119f1bf4d
parent 1933 7544700fd931
child 3822 000d122071b5
permissions -rw-r--r--
Merge with tonfa

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