Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-subdir.out @ 3113:f96c8e219865
merge: remove no longer possible clause
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 18:28:50 -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