D4072: resolve: add commands.resolve.mark-check=abort to tweakdefaults
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Sat Aug 4 13:13:44 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe9740c07158d: resolve: add commands.resolve.mark-check=abort to tweakdefaults (authored by spectral, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4072?vs=9834&id=9902
REVISION DETAIL
https://phab.mercurial-scm.org/D4072
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,6 +67,9 @@
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, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list