Mercurial > hg

view tests/test-resolve.out @ 10064:6f30c35766d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minirst: don't test regexps twice We know the regexps match since splitparagraphs used them too.
author Martin Geisler <mg@lazybytes.net>
date Sun, 13 Dec 2009 22:37:30 +0100
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