tests/test-merge4
author Jonathan Smith <https://issues.rpath.com/>
Mon, 15 Jan 2007 15:30:50 -0500
changeset 4030 a48971ae1387
parent 2283 e506c14382fd
permissions -rwxr-xr-x
install man pages by default into $(PREFIX)/share/man not $(PREFIX)/man since the FHS puts them there

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