tests/test-merge-force.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 14 Apr 2010 08:48:26 +0200
branchstable
changeset 10901 997173e49115
parent 8545 3682a19bb637
permissions -rw-r--r--
checklink: use an explicit prefix for the temporary file

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