tests/test-merge3
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 23 Sep 2005 07:41:25 -0700
changeset 1328 04ed65045bcc
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Merge with myself.

#!/bin/sh

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"