tests/test-merge-force.out
author Martin Geisler <mg@lazybytes.net>
Thu, 19 Nov 2009 22:25:38 +0100
branchstable
changeset 9891 5c5a08d6f85d
parent 8545 3682a19bb637
permissions -rw-r--r--
commands: do not indent list in clone help string

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