view tests/failfilemerge.py @ 35786:8144f1b07e21

tests: update test to work with Git 2.16

It looks like Git 2.16 removed the "..." from some strings.
Glob over those characters in the test output.

Differential Revision: https://phab.mercurial-scm.org/D1935

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)

def failfilemerge(filemergefn,
                  premerge, repo, wctx, mynode, orig, fcd, fco, fca,
                  labels=None):
    raise error.Abort("^C")
    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

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