tests/test-merge-force.out
author Matt Mackall <mpm@selenic.com>
Thu, 10 Jun 2010 15:23:31 -0500
changeset 11333 e83aff248c17
parent 8545 3682a19bb637
permissions -rw-r--r--
strip: backup bundles should use the .hg extension

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