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.

     1

syntax: glob

     2

     3

*.elc

     4

*.orig

     5

*.rej

     6

*~

     7

*.so

     8

*.pyc

     9

*.swp

    10

*.prof

    11

tests/*.err

    12

build

    13

dist

    14

doc/*.[0-9]

    15

doc/*.[0-9].{x,ht}ml

    16

MANIFEST

    17

patches

    18

mercurial/__version__.py

    19

    20

syntax: regexp

    21

^\.pc/