view tests/test-merge3.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 91c56c427171
children
line wrap: on
line source

removing b
nothing changed