Mercurial > hg
view tests/failfilemerge.py @ 46160:1d6aac94e6d5
copies: explain the "arbitrary" copy source pick in case of conflict
They are a logic and it is easy to explain, so lets explain it.
Differential Revision: https://phab.mercurial-scm.org/D9586
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 13 Dec 2020 19:18:10 +0100 |
parents | a736ab681b78 |
children | de8181c5414d |
line wrap: on
line source
# 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(b"^C") return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) def extsetup(ui): extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)