view tests/mockblackbox.py @ 27075:6373330155b2

mergestate._resolve: don't return the action any more

This is a partial backout of an earlier diff -- now that we're storing the
results in a dict, we don't actually need this any more.

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