Mercurial > hg
view tests/test-diff-subdir.out @ 4416:bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 May 2007 02:59:13 -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