##// END OF EJS Templates
Removed TODO from MANIFEST.in
Removed TODO from MANIFEST.in

File last commit:

r814:0902ffec merge default
r950:fbaf0380 default
Show More
test-merge4
17 lines | 315 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] Removal of a file added by merging branches...
r416
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] Removal of a file added by merging branches...
r416 echo This is file b1 > b
hg add b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "commit #1" -d "0 0"
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 hg update 0
echo This is file c1 > c
hg add c
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "commit #2" -d "0 0"
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 hg update -m 1
rm b
echo This is file c22 > c
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "commit #3" -d "0 0"