# HG changeset patch
# User Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
# Date 1562457329 14400
# Node ID 44e99811bea7605c77f8390bb748c35c4ab273b2
# Parent  70f1a84d07940ae07cf991ce7a7f6cd4ba597dc6
tweakdefaults: make hg resolve require --re-merge flag to re-merge

Pulkit suggested it in https://phab.mercurial-scm.org/D4379, and a
discussion with Octobus people reminded me that people still use the
error-prone default behavior of `hg resolve`.

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

diff -r 70f1a84d0794 -r 44e99811bea7 mercurial/ui.py
--- a/mercurial/ui.py	Thu Jul 04 21:29:28 2019 +0530
+++ b/mercurial/ui.py	Sat Jul 06 19:55:29 2019 -0400
@@ -68,6 +68,8 @@
 update.check = noconflict
 # Show conflicts information in `hg status`
 status.verbose = True
+# Make `hg resolve` with no action (like `-m`) fail instead of re-merging.
+resolve.explicit-re-merge = True
 
 [diff]
 git = 1