tests/test-merge3
author mpm@selenic.com
Wed, 13 Jul 2005 01:48:03 -0800
changeset 691 61c6b4178b9e
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rwxr-xr-x
HG environment variables take precedence over hgrc manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810

#!/bin/sh -x

hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
touch b
hg add b
rm b
hg commit -A -t"comment #1" -d "0 0" -u user