tests/test-merge-force.out
author Wagner Bruna <wbruna@softwareexpress.com.br>
Mon, 18 Jan 2010 15:37:45 -0200
branchstable
changeset 10258 d58d7441b211
parent 8545 3682a19bb637
permissions -rw-r--r--
i18n-pt_BR: synchronized with 279c8a73fde1

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