tests/test-merge-force.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 26 Jan 2009 16:40:43 +0100
changeset 7715 fd3266287b40
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
graphlog: reuse cmdutil.loglimit() instead of redefining

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