# HG changeset patch
# User Kyle Lippincott <spectral@google.com>
# Date 1541458905 28800
#      Mon Nov 05 15:01:45 2018 -0800
# Branch stable
# Node ID 8239d4e5d05f5452d66e4ae1ffc2f58e0d0fbd0d
# Parent  da2e874fe582e467eebb1203e3282c7a4e7b8405
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

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -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