tweakdefaults: remove commands.resolve.mark-check=abort, it is too broken
See issue6020 for the current case. I don't want to continue attempting to fix
this on the stable branch, so I'm removing from tweakdefaults and will send
fixes meant for the default branch and 4.9.
Differential Revision: https://phab.mercurial-scm.org/D5225
--- 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