tests/test-merge3
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 05 Oct 2007 12:30:19 -0700
changeset 5387 4b6f0aa568e5
parent 1933 7544700fd931
permissions -rwxr-xr-x
Update test for new output produced since 17ed9b9a0d03

#!/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"