Mercurial > hg > mercurial-crew

view tests/test-merge-force.out @ 10047:27267b1f68b4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: rewrite several method docstrings - methods: findmissing(), nodesbetween(), descendants(), ancestors() - the goal is precise, concise, accurate, grammatical, understandable, consistently formatted docstrings
author Greg Ward <greg-hg@gerg.ca>
date Thu, 10 Dec 2009 09:35:43 -0500
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