view tests/test-merge3 @ 797:95c258ee5264

Remove "export FOO=bar" bashism.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 14:54:36 +0100
parents 7e4843b7efd2
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
line wrap: on
line source

#!/bin/sh -x

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"