Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-nested-repo.out @ 3240:8d4855fd9d7b
merge: use new working context object in update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 03 Oct 2006 01:21:46 -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