Mercurial > public > mercurial-scm > hg-stable

view tests/test-resolve.out @ 9037:a232b90ffb51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: remove unnecessary diamond-shaped multiple inheritance
author Alejandro Santos <alejolp@alejolp.com>
date Sun, 05 Jul 2009 11:06:41 +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