tests/test-merge4
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 11 May 2006 14:41:52 -0700
changeset 2268 6c9305fbebaf
parent 1933 7544700fd931
child 2283 e506c14382fd
permissions -rwxr-xr-x
fix coding style of backout editor change.

#!/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 update -m 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"