view tests/test-merge-force.out @ 7599:7bf7c073375e

lowercase ui.debug and assert output This does not effect the log or status commands and should be okay according to the compatibility rules.
author Martin Geisler <mg@daimi.au.dk>
date Sat, 03 Jan 2009 17:15:21 +0100
parents 4b0c9c674707
children 3682a19bb637
line wrap: on
line source

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