Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 33523:11025c4f1016
configitems: register the 'ui.mergemarkertemplate' config
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 30 Jun 2017 03:44:56 +0200 |
| parents | 0407a51b9d8c |
| children | 50c44dee741a |
line wrap: on
line diff
--- a/mercurial/filemerge.py Sat Jul 15 14:14:53 2017 +0200 +++ b/mercurial/filemerge.py Fri Jun 30 03:44:56 2017 +0200 @@ -555,13 +555,6 @@ # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') return util.ellipsis(mark, 80 - 8) -_defaultconflictmarker = ('{node|short} ' - '{ifeq(tags, "tip", "", ' - 'ifeq(tags, "", "", "{tags} "))}' - '{if(bookmarks, "{bookmarks} ")}' - '{ifeq(branch, "default", "", "{branch} ")}' - '- {author|user}: {desc|firstline}') - _defaultconflictlabels = ['local', 'other'] def _formatlabels(repo, fcd, fco, fca, labels): @@ -574,7 +567,7 @@ ca = fca.changectx() ui = repo.ui - template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) + template = ui.config('ui', 'mergemarkertemplate') template = templater.unquotestring(template) tmpl = formatter.maketemplater(ui, template)