tests/test-diff-subdir.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 15 Aug 2006 11:38:07 -0700
changeset 2903 013921c753bd
parent 2878 66eff8355168
permissions -rw-r--r--
merge with other head by default, not tip. fixes issue 339.

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