Mercurial > public > mercurial-scm > hg-stable

diff mercurial/configitems.py @ 33523:11025c4f1016

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'ui.mergemarkertemplate' config
author Boris Feld <boris.feld@octobus.net>
date Fri, 30 Jun 2017 03:44:56 +0200
parents 62b29ca72d1a
children 96f43981c1c4
line wrap: on
line diff
--- 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,
 )