tests/test-diff-subdir.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 01 Aug 2007 12:03:10 -0700
changeset 5043 8b1ee1f59b3c
parent 2878 66eff8355168
permissions -rw-r--r--
dirstate: improve error message on file/directory clash

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