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.

mercurial/configitems.py

@@ -344,6 +344,12 b" 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,
 )

mercurial/merge.py

@@ -603,7 +603,7 b' 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])