tests/test-diff-subdir.out
author Matt Mackall <mpm@selenic.com>
Tue, 22 Aug 2006 19:39:54 -0500
changeset 3096 54d85098fb82
parent 2878 66eff8355168
permissions -rw-r--r--
merge: make unresolved a counter

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