tests/test-merge-force.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 26 Mar 2008 10:12:10 -0700
changeset 6389 0231f763ebc8
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
manifest: improve parsing performance by 8x via a new C extension

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