tests/test-merge-force.out
author Matt Mackall <mpm@selenic.com>
Sat, 07 Nov 2009 16:29:49 -0600
changeset 9779 58a6f3f4d553
parent 8545 3682a19bb637
permissions -rw-r--r--
subrepo: add some debug output to submerge

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