Mercurial > hg

view tests/test-resolve.out @ 10536:093008fc4078 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-ja: synchronized with eddf859343de
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 24 Feb 2010 15:02:06 +0900
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