view tests/test-merge3 @ 5148:a04694e08775

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 11 Aug 2007 13:35:25 +0200
parents 7544700fd931
children
line wrap: on
line source

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