Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 45791:5effb1992c17
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 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Fri Oct 23 15:59:32 2020 -0700 +++ b/mercurial/filemerge.py Mon Oct 26 10:33:32 2020 -0700 @@ -643,7 +643,7 @@ def _describemerge(ui, repo, mynode, fcl, fcb, fco, env, toolpath, args): - tmpl = ui.config(b'ui', b'pre-merge-tool-output-template') + tmpl = ui.config(b'command-templates', b'pre-merge-tool-output') if not tmpl: return