view tests/test-resolve.out @ 10191:99d285ac5da4

mq: qdiff with the same diff options than qrefresh (issue1350)

Specifically, if current patch is a git patch and mq.git=keep, diff in git
mode.

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