Mercurial > hg

view tests/test-resolve.out @ 9566:449e85edc8f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-pt_BR: synchronized with a1ee850f49e3
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 28 Sep 2009 20:14:39 -0300
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