Mercurial > hg

view tests/test-resolve.out @ 10954:33119d0252c1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: fix repo root path handling in svn subrepo
author Brett Cannon <brett@python.org>
date Sun, 18 Apr 2010 14:20:08 -0700
parents b2310903c462
children 51021f4c80b5
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 update -C' to abandon
% resolve -l, should be empty