Mercurial > hg
view tests/test-merge-force.out @ 9914:f139814d20b3
merge with stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 23 Nov 2009 23:04:44 +0100 |
parents | 3682a19bb637 |
children |
line wrap: on
line source
created new head % local deleted a file, remote removed abort: outstanding uncommitted changes (use 'hg status' to list changes) resolving manifests removing a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) % should show a as removed R a % manifest. should not have a: b