diff -r 157f0e29eaa3 -r db61a18148a4 mercurial/ui.py
--- a/mercurial/ui.py	Fri Nov 09 10:47:24 2018 -0800
+++ b/mercurial/ui.py	Sat Nov 10 12:07:26 2018 +0900
@@ -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