tests/test-diff-subdir.out
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 27 Aug 2007 13:38:34 -0700
changeset 5257 fd371f99f20b
parent 2879 66eff8355168
permissions -rw-r--r--
Automated merge with http://hg.intevation.org/mercurial/crew

EVERYTHING
diff -r ec612a6291f1 alpha/one
--- a/alpha/one
+++ b/alpha/one
@@ -0,0 +1,1 @@
+1
diff -r ec612a6291f1 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2
BETA ONLY
diff -r ec612a6291f1 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2
INSIDE BETA
diff -r ec612a6291f1 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2