Mercurial > hg-stable

view tests/test-resolve.out @ 9978:30c81aee4d95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-da: synchronized with af5f99d8195e
author Martin Geisler <mg@lazybytes.net>
date Sun, 29 Nov 2009 20:32:41 +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