Mercurial > public > mercurial-scm > hg

view tests/test-resolve.out @ 7861:2bc14da14992

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: blacklist pythoncom win32com.shell would segfault at import time if pythoncom was demand loaded.
author Steve Borho <steve@borho.org>
date Mon, 09 Mar 2009 21:00:37 -0500
parents 9fe7e6acf525
children b2310903c462
line wrap: on
line source

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% resolve -l, should be empty