Mercurial > hg

view tests/test-merge-force.out @ 6380:a632a9a57821

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qclone: do not abort if remote hasn't enabled mq (issue1040)
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 24 Mar 2008 16:17:19 -0300
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