view tests/test-resolve.out @ 7812:18048153fd4e

test-convert-cvs*: mute output from "cvs up"

Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.

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
% resolve -l, should be empty