Mercurial > public > mercurial-scm > hg-stable

diff mercurial/ui.py @ 38897:e9740c07158d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add commands.resolve.mark-check=abort to tweakdefaults Differential Revision: https://phab.mercurial-scm.org/D4072
author Kyle Lippincott <spectral@google.com>
date Fri, 03 Aug 2018 12:59:01 -0700
parents afc4ad706f9c
children 6f38284b23f4
line wrap: on
line diff
--- a/mercurial/ui.py	Fri Aug 03 12:57:44 2018 -0700
+++ b/mercurial/ui.py	Fri Aug 03 12:59:01 2018 -0700
@@ -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