tests/test-diff-subdir.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 09 Sep 2006 12:51:05 +0200
changeset 3073 1a792e4a1f3a
parent 2878 66eff8355168
permissions -rw-r--r--
merge with brendan

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