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.

#!/bin/sh

hg init
touch unknown

touch a
hg add a
hg ci -m "1" -d "0 0"

touch b
hg add b
hg ci -m "2" -d "0 0"

echo %% Should show unknown
hg status
hg revert -r 0
echo %% Should show unknown and b removed
hg status
echo %% Should show a and unknown
ls