##// END OF EJS Templates
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.

File last commit:

r749:7e4843b7 default
r800:ec85f9e6 default
Show More
test-merge4.out
15 lines | 318 B | text/plain | TextLexer
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -m 'commit #2' -d '0 0'
+ hg update -m 1
+ rm b
+ echo This is file c22
+ hg commit -m 'commit #3' -d '0 0'