Mercurial > hg
view tests/test-merge-force.out @ 10359:ec02cf8d1628
mq: add --mq option to some commands
This causes them to operate on the queue repository as qcommit does, and
is nicer than hg -R $(hg root)
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 23 Dec 2008 09:46:40 -0800 |
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