##// END OF EJS Templates
Incorporated most of Aron Griffis suggestions for sh compatibility.
Incorporated most of Aron Griffis suggestions for sh compatibility.

File last commit:

r800:ec85f9e6 default
r804:19388dcb default
Show More
test-merge4
17 lines | 315 B | text/plain | TextLexer
#!/bin/sh
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "0 0"
hg update -m 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "0 0"