D5225: tweakdefaults: remove commands.resolve.mark-check=abort, it is too broken

[spectral (Kyle Lippincott)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8239d4e5d05f: tweakdefaults: remove commands.resolve.mark-check=abort, it is too broken (authored by spectral, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5225?vs=12434&id=12438

REVISION DETAIL
  https://phab.mercurial-scm.org/D5225

AFFECTED FILES
  mercurial/ui.py

CHANGE DETAILS

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



To: spectral, #hg-reviewers
Cc: mercurial-devel