##// END OF EJS Templates
filemerge: add a 'leave unresolved' option to regular prompts...
filemerge: add a 'leave unresolved' option to regular prompts 'Regular' here means anything that isn't a change/delete prompt. We'll add this option to change/delete prompts in a subsequent patch.

File last commit:

r24705:0ead0a07 default
r27162:4ab69be0 default
Show More
mockblackbox.py
11 lines | 229 B | text/x-python | PythonLexer
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