Mercurial > hg

view tests/test-resolve.out @ 11710:58a038605a2b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge crew and main
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sat, 31 Jul 2010 11:04:33 +0900
parents 51021f4c80b5
children
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
% resolve -l, should be empty