diff -r da2e874fe582 -r 8239d4e5d05f mercurial/ui.py
--- a/mercurial/ui.py	Fri Nov 02 11:57:45 2018 -0700
+++ b/mercurial/ui.py	Mon Nov 05 15:01:45 2018 -0800
@@ -67,9 +67,6 @@
 update.check = noconflict
 # Show conflicts information in `hg status`
 status.verbose = True
-# Refuse to perform `hg resolve --mark` on files that still have conflict
-# markers
-resolve.mark-check = abort
 
 [diff]
 git = 1