view tests/test-merge3 @ 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.

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"