config: rename ui.mergemarkertemplate to command-templates.mergemarker
Differential Revision: https://phab.mercurial-scm.org/D9247
Showing
- mercurial/configitems.py 14 additions, 13 deletionsmercurial/configitems.py
- mercurial/filemerge.py 2 additions, 2 deletionsmercurial/filemerge.py
- mercurial/helptext/config.txt 26 additions, 23 deletionsmercurial/helptext/config.txt
- tests/test-conflict.t 33 additions, 4 deletionstests/test-conflict.t
Loading
Please register or sign in to comment