Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 45791:5effb1992c17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: move ui.pre-merge-tool-output-template into [command-templates] Differential Revision: https://phab.mercurial-scm.org/D9249
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 26 Oct 2020 10:33:32 -0700
parents 40411ad2f5d2
children 89a2afe31e82
comparison
equal deleted inserted replaced
45790:40411ad2f5d2 45791:5effb1992c17
641 b'in-memory merge does not support external merge tools' 641 b'in-memory merge does not support external merge tools'
642 ) 642 )
643 643
644 644
645 def _describemerge(ui, repo, mynode, fcl, fcb, fco, env, toolpath, args): 645 def _describemerge(ui, repo, mynode, fcl, fcb, fco, env, toolpath, args):
646 tmpl = ui.config(b'ui', b'pre-merge-tool-output-template') 646 tmpl = ui.config(b'command-templates', b'pre-merge-tool-output')
647 if not tmpl: 647 if not tmpl:
648 return 648 return
649 649
650 mappingdict = templateutil.mappingdict 650 mappingdict = templateutil.mappingdict
651 props = { 651 props = {