Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-subdir.out @ 4296:c2c8491a30d6
test-rename-merge2: avoid a shell script
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 27 Mar 2007 01:41:20 -0300 |
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