view tests/failfilemerge.py @ 49827:d09a57ce6fc4

verify: print short `p1` node in relevant dirstate messages

This will help with debugging.

# extension to emulate interrupting filemerge._filemerge


from mercurial import (
    error,
    extensions,
    filemerge,
)


def failfilemerge(*args, **kwargs):
    raise error.Abort(b"^C")


def extsetup(ui):
    extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)