Mercurial > hg

view tests/test-merge-force.out @ 8471:e88cc16ba603

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchbomb: fix help to reflect actual operation In the body, the description is shown in its entirety, unstripped from what was already in the subject.
author Cédric Duval <cedricduval@free.fr>
date Sun, 17 May 2009 09:45:49 +0200
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