mercurial/configitems.py

--- 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,
 )