tests/test-merge-force.out
author Fabian Kreutz <fabian.kreutz@starnet.fi>
Thu, 02 Apr 2009 10:30:00 +0300
changeset 7940 e2e13a7af148
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
i18n-de: Commands (push and pull) + typos

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted 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