tests/test-resolve.out
author Brendan Cully <brendan@kublai.com>
Mon, 29 Jun 2009 09:32:06 -0700
changeset 8961 c963d49ac7a1
parent 7821 9fe7e6acf525
child 9468 b2310903c462
permissions -rw-r--r--
Relicense zsh completion script under zsh license. Steve agreed some time ago.

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