tests/test-merge-force.out
author Martin Geisler <mg@daimi.au.dk>
Sat, 04 Apr 2009 23:18:03 +0200
changeset 7994 3c22fdc741d8
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
mq: word-wrap help texts at 70 characters

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