tests/test-merge-force.out
author Matt Mackall <mpm@selenic.com>
Mon, 16 Mar 2009 17:56:50 -0500
changeset 7844 dd73860c6059
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
Merge with crew

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