# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1498787096 -7200
# Node ID 11025c4f1016de901fe98b98b35a67a28bcd7838
# Parent  62b29ca72d1adb25888c74d9d359a245ec206f84
configitems: register the 'ui.mergemarkertemplate' config

diff -r 62b29ca72d1a -r 11025c4f1016 mercurial/configitems.py
--- a/mercurial/configitems.py	Sat Jul 15 14:14:53 2017 +0200
+++ b/mercurial/configitems.py	Fri Jun 30 03:44:56 2017 +0200
@@ -484,6 +484,14 @@
 coreconfigitem('ui', 'mergemarkers',
     default='basic',
 )
+coreconfigitem('ui', 'mergemarkertemplate',
+    default=('{node|short} '
+            '{ifeq(tags, "tip", "", '
+            'ifeq(tags, "", "", "{tags} "))}'
+            '{if(bookmarks, "{bookmarks} ")}'
+            '{ifeq(branch, "default", "", "{branch} ")}'
+            '- {author|user}: {desc|firstline}')
+)
 coreconfigitem('ui', 'nontty',
     default=False,
 )
diff -r 62b29ca72d1a -r 11025c4f1016 mercurial/filemerge.py
--- 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)