Mercurial > hg

view tests/test-resolve.out @ 9183:d0225fa2f6c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not translate commit messages It is not very helpful to have 'Added tag %s for changeset %s' and similar messages translated into different languages when people work together using different locales. We now use English strings without support for translations. If needed, the user can still supply a custom string for most commands.
author Martin Geisler <mg@lazybytes.net>
date Wed, 22 Jul 2009 22:50:34 +0200
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