tests/test-merge-force.out
author Wagner Bruna <wbruna@softwareexpress.com.br>
Mon, 28 Sep 2009 20:14:39 -0300
changeset 9566 449e85edc8f1
parent 8545 3682a19bb637
permissions -rw-r--r--
i18n-pt_BR: synchronized with a1ee850f49e3

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