Mercurial > hg
view tests/failfilemerge.py @ 29963:e824de573112
remove: specify hg in added warning
author | timeless <timeless@mozdev.org> |
---|---|
date | Fri, 02 Sep 2016 21:46:00 +0000 |
parents | a7f8939641aa |
children | 318a24b52eeb |
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)