tests/test-diff-subdir.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 11 Jan 2007 23:13:32 +0100
changeset 4022 bf329bda51a6
parent 2878 66eff8355168
permissions -rw-r--r--
Merge branchname changes in localrepo.commit.

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