view tests/test-merge3 @ 1930:70be74899338

merge with crew
author Peter van Dijk <peter@dataloss.nl>
date Mon, 06 Mar 2006 18:00:44 +0100
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

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