Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-diff-subdir.out @ 3044:fcadf7a32425

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
date Sun, 03 Sep 2006 06:06:02 -0400
parents 66eff8355168
children
comparison
equal deleted inserted replaced
3043:2a4d4aecb2b4 3044:fcadf7a32425
1 EVERYTHING
2 diff -r ec612a6291f1 alpha/one
3 --- a/alpha/one
4 +++ b/alpha/one
5 @@ -0,0 +1,1 @@
6 +1
7 diff -r ec612a6291f1 beta/two
8 --- a/beta/two
9 +++ b/beta/two
10 @@ -0,0 +1,1 @@
11 +2
12 BETA ONLY
13 diff -r ec612a6291f1 beta/two
14 --- a/beta/two
15 +++ b/beta/two
16 @@ -0,0 +1,1 @@
17 +2
18 INSIDE BETA
19 diff -r ec612a6291f1 beta/two
20 --- a/beta/two
21 +++ b/beta/two
22 @@ -0,0 +1,1 @@
23 +2