tests/test-resolve.out
author Matt Mackall <mpm@selenic.com>
Sat, 19 Jun 2010 12:22:35 -0500
changeset 11404 37cbedbeae96
parent 9468 b2310903c462
child 11451 51021f4c80b5
permissions -rw-r--r--
revset: allow extended characters in symbols

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