view tests/test-merge3 @ 4683:8c3d449ecc63

Merge with main
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 23 Jun 2007 12:05:00 +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"