tests/test-merge4
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Mon, 09 Jul 2007 17:41:14 +0300
changeset 4877 242026115e6a
parent 2283 e506c14382fd
permissions -rwxr-xr-x
hg grep: handle re.compile errors & update tests/test-grep

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"