Mercurial > hg

view tests/test-merge-force.out @ 6642:c8c7248f6172

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add file codes to doc string
author Adrian Buehlmann <adrian@cadifra.com>
date Sat, 31 May 2008 11:37:55 +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