diff mercurial/configitems.py @ 38251:ead71b15efd5

merge with stable
author Augie Fackler <augie@google.com>
date Wed, 06 Jun 2018 13:31:24 -0400
parents ee1f052b45ef 8c828beb7543
children 15a1e37f80bd
line wrap: on
line diff
--- a/mercurial/configitems.py	Sat May 26 03:01:14 2018 +0530
+++ b/mercurial/configitems.py	Wed Jun 06 13:31:24 2018 -0400
@@ -1128,6 +1128,9 @@
 coreconfigitem('ui', 'rollback',
     default=True,
 )
+coreconfigitem('ui', 'signal-safe-lock',
+    default=True,
+)
 coreconfigitem('ui', 'slash',
     default=False,
 )