tests/test-resolve.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 31 Oct 2009 00:27:50 +0100
changeset 9674 603b23c6967b
parent 9468 b2310903c462
child 11451 51021f4c80b5
permissions -rw-r--r--
localrepo/branchcache: kill unused localrepo.branchcache The UTF-8 version of the branchcache is the master, always up-to-date, we can rename it to localrepo._branchcache.

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