view tests/test-issue612.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 src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
? src/a.o
merging src/a.c and source/a.c to source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o