Mercurial > hg
view tests/test-nested-repo.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 | 74f70f2e08aa |
children | d316124ebbea |
line wrap: on
line source
# should print nothing # should print ? b/x ? b/x # should print A b/x A b/x # should forget b/x forgetting b/x # should print nothing