Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-subdir.out @ 3709:38291d9c8c1c
Expand test-commit to cover one of the recent bugs.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Wed, 22 Nov 2006 00:53:56 +0200 |
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