view tests/test-merge3 @ 9316:23cf7b52785a

merge with crew-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 05 Aug 2009 17:21:29 +0200
parents 7544700fd931
children 6a64813276ed
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"