tests/test-merge-force.out
author David Soria Parra <dsp@php.net>
Sun, 07 Dec 2008 19:31:38 +0100
changeset 7488 e80a734ba1fc
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
Backed out changeset 4c3e0ad58c5b In discussion with mpm and tonfa we decided that we need a more generic solution and not a bookmark specific.

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