tests/test-diff-subdir.out
author Matt Mackall <mpm@selenic.com>
Wed, 01 Nov 2006 21:47:55 -0600
changeset 3618 3109f012c305
parent 2879 66eff8355168
permissions -rw-r--r--
Clarify untracked file merge message

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