Mercurial > hg

view tests/test-merge-force.out @ 10323:0aa59f532ef9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
record: function variable naming & signature cleanup. No functionality change. All tests pass.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Fri, 05 Feb 2010 18:46:22 +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