tests/test-merge3.out

Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-mcomment #1' -d '0 0'
adding .out
removing b
b never committed!