Mercurial > hg

view tests/test-diff-subdir.out @ 2973:a31557193f3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify working dir manifest generation
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:08:38 -0500
parents 66eff8355168
children
line wrap: on
line source

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