Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-nested-repo.out @ 2799:b550cd82f92a
Move merge code to its own module
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 03 Aug 2006 15:24:41 -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