Mercurial > hg
view tests/failfilemerge.py @ 29572:d86b54d9bb0c
paper: make different blocks of annotated lines have different colors
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 16 Jul 2016 14:49:07 +0800 |
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)