tests/test-resolve.out
author Matt Mackall <mpm@selenic.com>
Fri, 20 Aug 2010 21:28:14 -0500
changeset 12007 652f71b235bf
parent 11451 51021f4c80b5
permissions -rw-r--r--
bisect: add test for unrelated starting revisions

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 update -C' to abandon
% resolve -l, should be empty
% resolve -l, should be empty