diff tests/test-merge-types.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.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 27 Feb 2009 17:52:31 +0100
parents 8dca507e56ce
children af5f099d932b
line wrap: on
line diff