tests/test-diff-subdir.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 02 Oct 2007 20:25:35 +0200
changeset 5351 efe7ef325737
parent 2878 66eff8355168
permissions -rw-r--r--
merge with -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