view tests/test-resolve.out @ 11701:84fb29f5e0d2

mq: fix qimport --name --existing --force on win32

os.rename() does not overwrite existing targets on Windows.

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