tests/test-merge3
author mpm@selenic.com
Wed, 20 Jul 2005 20:00:29 -0500
changeset 740 d2422f10c136
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rwxr-xr-x
Merge from BOS manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659

#!/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