tests/test-merge-force.out
author Simon Heimberg <simohe@besonet.ch>
Thu, 14 May 2009 10:59:55 +0200
changeset 8380 a00a4db76a15
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
context: replace pseudo-set by real set

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted 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