Mercurial > hg

view tests/test-merge-force.out @ 10712:fbe138da6b38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: 1 variable name for overwriting candidates
author Christian Ebert <blacktrash@gmx.net>
date Tue, 16 Mar 2010 22:28:23 +0100
parents 3682a19bb637
children
line wrap: on
line source

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes (use 'hg status' to list 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