tests/mockblackbox.py

filemerge: clean up temp files in a finally block

This isn't really a big deal because the temp files are created in $TMPDIR, but
it makes some upcoming work simpler.

from mercurial import util

def makedate():
    return 0, 0
def getuser():
    return 'bob'

# mock the date and user apis so the output is always the same
def uisetup(ui):
    util.makedate = makedate
    util.getuser = getuser