tests/test-merge-force.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Tue, 23 Mar 2010 20:01:30 +0100
branchstable
changeset 10761 16a13fdb4b36
parent 8545 3682a19bb637
permissions -rw-r--r--
setup: fail if bz2 is not available

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