view tests/test-merge3 @ 4144:03e9c22a6489

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 05 Mar 2007 19:54:21 +0100
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"