view tests/mockblackbox.py @ 27163:27b89a0957ec

filemerge: add a 'leave unresolved' option to change/delete prompts

We're going to make this option the default in an upcoming patch.

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