Mercurial > public > mercurial-scm > hg

diff mercurial/configitems.py @ 34522:bed1d2eaa108

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register 'merge.checkunknown' and 'merge.checkignored' They both use the same function defining a default, so we need to update them at the same time.
author Boris Feld <boris.feld@octobus.net>
date Sun, 08 Oct 2017 21:48:40 +0200
parents aacb17cc0ee4
children 486dbd6afa57
line wrap: on
line diff
--- a/mercurial/configitems.py	Sun Oct 08 21:47:14 2017 +0200
+++ b/mercurial/configitems.py	Sun Oct 08 21:48:40 2017 +0200
@@ -344,6 +344,12 @@
 coreconfigitem('http_proxy', 'user',
     default=None,
 )
+coreconfigitem('merge', 'checkunknown',
+    default='abort',
+)
+coreconfigitem('merge', 'checkignored',
+    default='abort',
+)
 coreconfigitem('merge', 'followcopies',
     default=True,
 )