tests/test-merge-force.out
author Martin Geisler <mg@lazybytes.net>
Tue, 09 Jun 2009 23:24:43 +0200
changeset 8767 b03859265cc4
parent 8545 3682a19bb637
permissions -rw-r--r--
hgrc.5: single quotes means italic in asciidoc Use double quotes instead and mark the * as monospaced text.

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