##// 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:

r767:61ed30e8 default
r800:ec85f9e6 default
Show More
test-merge5.out
20 lines | 422 B | text/plain | TextLexer
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b22
+ hg commit '-mcomment #1' -d '0 0'
+ hg update 0
+ rm b
+ hg commit -A '-mcomment #2' -d '0 0'
removing b
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
b
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0