view tests/test-diffdir.out @ 1560:6efad1cc07de

Merge with http://hg.omnifarious.org/~hopper/mercurial
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 29 Nov 2005 18:06:23 +0100
parents 5a034646e472
children fde8fb2cbede
line wrap: on
line source

diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123