tests/test-merge-force.out
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Tue, 30 Dec 2008 22:10:41 +0100
changeset 7554 11a4eb81fb4f
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
test-audit-path: add more tests (issue 1450)

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