tests/test-merge-force.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Sun, 07 Feb 2010 16:04:42 +0100
changeset 10381 a7df048b6a0d
parent 8545 3682a19bb637
permissions -rw-r--r--
merge with mpm

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