Mercurial > hg-stable

changeset 40432:8239d4e5d05f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Kyle Lippincott <spectral@google.com>
date Mon, 05 Nov 2018 15:01:45 -0800
parents da2e874fe582
children 5b530d767e67
files mercurial/ui.py
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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