tests/test-diffdir.out
author Matt Mackall <mpm@selenic.com>
Tue, 17 Oct 2006 18:54:37 -0500
changeset 3436 357b5589dc62
parent 1933 7544700fd931
child 3822 000d122071b5
permissions -rw-r--r--
Merge with crew

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