Mercurial > hg
comparison mercurial/configitems.py @ 45768: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 | 96fcc37a9c80 |
comparison
equal
deleted
inserted
replaced
| 45767:40411ad2f5d2 | 45768:5effb1992c17 |
|---|---|
| 243 b'{ifeq(branch, "default", "", "{branch} ")}' | 243 b'{ifeq(branch, "default", "", "{branch} ")}' |
| 244 b'- {author|user}: {desc|firstline}' | 244 b'- {author|user}: {desc|firstline}' |
| 245 ), | 245 ), |
| 246 alias=[(b'ui', b'mergemarkertemplate')], | 246 alias=[(b'ui', b'mergemarkertemplate')], |
| 247 ) | 247 ) |
| 248 coreconfigitem( | |
| 249 b'command-templates', | |
| 250 b'pre-merge-tool-output', | |
| 251 default=None, | |
| 252 alias=[(b'ui', b'pre-merge-tool-output-template')], | |
| 253 ) | |
| 248 _registerdiffopts(section=b'commands', configprefix=b'commit.interactive.') | 254 _registerdiffopts(section=b'commands', configprefix=b'commit.interactive.') |
| 249 coreconfigitem( | 255 coreconfigitem( |
| 250 b'commands', b'commit.post-status', default=False, | 256 b'commands', b'commit.post-status', default=False, |
| 251 ) | 257 ) |
| 252 coreconfigitem( | 258 coreconfigitem( |
| 1344 ) | 1350 ) |
| 1345 coreconfigitem( | 1351 coreconfigitem( |
| 1346 b'ui', b'patch', default=None, | 1352 b'ui', b'patch', default=None, |
| 1347 ) | 1353 ) |
| 1348 coreconfigitem( | 1354 coreconfigitem( |
| 1349 b'ui', b'pre-merge-tool-output-template', default=None, | |
| 1350 ) | |
| 1351 coreconfigitem( | |
| 1352 b'ui', b'portablefilenames', default=b'warn', | 1355 b'ui', b'portablefilenames', default=b'warn', |
| 1353 ) | 1356 ) |
| 1354 coreconfigitem( | 1357 coreconfigitem( |
| 1355 b'ui', b'promptecho', default=False, | 1358 b'ui', b'promptecho', default=False, |
| 1356 ) | 1359 ) |