Mercurial > hg

view tests/test-merge-force.out @ 7594:a204547790bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: added testcase for cvsps log message lookahead
author Frank Kingswood <frank@kingswood-consulting.co.uk>
date Sun, 04 Jan 2009 10:06:44 +0000
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