# HG changeset patch
# User Kyle Lippincott <spectral@google.com>
# Date 2018-08-03 19:59:01
# Node ID e9740c07158d8d6e0279a93631120fb76e085604
# Parent  96d0795bd0bd2c2ed4f2d93188b27cc2563cf262

resolve: add commands.resolve.mark-check=abort to tweakdefaults

Differential Revision: https://phab.mercurial-scm.org/D4072

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -67,6 +67,9 @@ status.relative = yes
 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