tests/test-diff-subdir.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 20 May 2007 19:32:22 +0200
changeset 4449 7eb604da8764
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