tests/test-resolve.out
author Martin Geisler <mg@lazybytes.net>
Tue, 09 Jun 2009 23:24:43 +0200
changeset 8767 b03859265cc4
parent 7821 9fe7e6acf525
child 9468 b2310903c462
permissions -rw-r--r--
hgrc.5: single quotes means italic in asciidoc Use double quotes instead and mark the * as monospaced text.

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