tests/test-diff-subdir.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 11 Aug 2007 13:35:25 +0200
changeset 5148 a04694e08775
parent 2878 66eff8355168
permissions -rw-r--r--
merge with crew-stable

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