tests/test-merge-force.out
author Brendan Cully <brendan@kublai.com>
Sat, 18 Oct 2008 16:40:01 -0700
changeset 7158 d1d011accf94
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
mq: let qimport read patches from URLs

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted 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