Mercurial > hg

view tests/test-merge-force.out @ 7468:3e5db4228f8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add support to keep branch names Callback on extra fields added by Patrick Mezard <pmezard@gmail.com>.
author Augie Fackler <durin42@gmail.com>
date Tue, 18 Nov 2008 21:46:01 -0600
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