##// END OF EJS Templates
merge with crew-stable
merge with crew-stable

File last commit:

r1933:7544700f default
r4181:ac9e891f merge default
Show More
test-merge3
10 lines | 158 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
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg commit -m "commit #0" -d "1000000 0"
mpm@selenic.com
[PATCH] (3/4) Removing an added file...
r402 touch b
hg add b
rm b
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg commit -A -m"comment #1" -d "1000000 0"