Mercurial > hg

view tests/test-resolve.out @ 7896:e6d3999c0cb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: more commands.py translations
author Fabian Kreutz <fabian.kreutz@qvantel.com>
date Tue, 24 Mar 2009 18:52:48 +0100
parents 9fe7e6acf525
children b2310903c462
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 up --clean' to abandon
% resolve -l, should be empty