Mercurial > hg

view tests/test-merge-force.out @ 10684:485c1d7f8a77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: fix coding style (missing space)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 14 Mar 2010 11:12:51 +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