Mercurial > hg
view tests/failfilemerge.py @ 29349:8bf84295e59b
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 14 Jun 2016 14:52:58 -0500 |
parents | 424c1632fffb |
children | a7f8939641aa |
line wrap: on
line source
# extension to emulate interupting filemerge._filemerge from __future__ import absolute_import from mercurial import ( error, extensions, filemerge, ) def failfilemerge(filemergefn, premerge, repo, 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)