##// 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-merge3
10 lines | 146 B | text/plain | TextLexer
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
r800 #!/bin/sh
mpm@selenic.com
[PATCH] (3/4) Removing an added file...
r402
hg init
echo This is file a1 > a
hg add a
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "commit #0" -d "0 0"
mpm@selenic.com
[PATCH] (3/4) Removing an added file...
r402 touch b
hg add b
rm b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -A -m"comment #1" -d "0 0"