tests/test-diffdir.out
author Matt Mackall <mpm@selenic.com>
Tue, 10 Oct 2006 03:39:44 -0500
changeset 3323 39fd6e82ea38
parent 1933 7544700fd931
child 3822 000d122071b5
permissions -rw-r--r--
merge: pull user messages out to hg.py - add _update for shadowing in clone - add _showstats helper - remove update parameter defaults - move stats message and merge help messages

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