tests/test-diff-subdir.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Sep 2006 21:11:26 -0500
changeset 3121 1c1e59aac82a
parent 2878 66eff8355168
permissions -rw-r--r--
merge: simplify local created logic

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