view tests/test-diffdir.out @ 2657:6024216754f4

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 24 Jul 2006 11:35:04 -0500
parents 7544700fd931
children 000d122071b5
line wrap: on
line source

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