tests/test-merge-force.out
author Matt Mackall <mpm@selenic.com>
Sun, 31 May 2009 17:54:18 -0500
changeset 8676 acd69fc201a5
parent 8545 3682a19bb637
permissions -rw-r--r--
walk: we always have a badfn

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