Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 5031:af0995261f02
extensions: don't get confused by aliasing between "foo" and "hgext.foo"
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 30 Jul 2007 14:53:03 -0700 |
parents | fffc8a733bf9 |
children |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes