hgmerge: add cleanup functions This patch adds functions cleanup, success and failure. The last two of these should be used instead of exit. Current code was changed to use them. It also moves $HGTMP to the top of the file (it's used in the cleanup function), changes the comment and removes now unneeded trap in the diff+patch merge.

%% Should show unknown
? unknown
%% Should show unknown and b removed
! b
? unknown
%% Should show a and unknown
a
unknown