Mercurial > public > mercurial-scm > hg-stable

diff mercurial/configitems.py @ 33172:5c9ad50fd62f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: register the 'devel.strip-obsmarkers' config The single explicit default that existed so far is converted to registered config value.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 28 Jun 2017 13:32:36 +0200
parents 1a6f28439135
children be723e2afd3d
line wrap: on
line diff
--- a/mercurial/configitems.py	Wed Jun 28 13:32:28 2017 +0200
+++ b/mercurial/configitems.py	Wed Jun 28 13:32:36 2017 +0200
@@ -80,6 +80,9 @@
 coreconfigitem('devel', 'serverrequirecert',
     default=None,
 )
+coreconfigitem('devel', 'strip-obsmarkers',
+    default=True,
+)
 coreconfigitem('patch', 'fuzz',
     default=2,
 )