# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 2017-10-08 19:48:40
# Node ID bed1d2eaa1083d6096de0ffb407604d3410f64bc
# Parent  aacb17cc0ee4a5cfacb871b075b0134c04e1fee9

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.

diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -344,6 +344,12 @@ coreconfigitem('http_proxy', 'passwd',
 coreconfigitem('http_proxy', 'user',
     default=None,
 )
+coreconfigitem('merge', 'checkunknown',
+    default='abort',
+)
+coreconfigitem('merge', 'checkignored',
+    default='abort',
+)
 coreconfigitem('merge', 'followcopies',
     default=True,
 )
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -603,7 +603,7 @@ class mergestate(object):
         self._results[f] = 0, 'g'
 
 def _getcheckunknownconfig(repo, section, name):
-    config = repo.ui.config(section, name, default='abort')
+    config = repo.ui.config(section, name)
     valid = ['abort', 'ignore', 'warn']
     if config not in valid:
         validstr = ', '.join(["'" + v + "'" for v in valid])