# HG changeset patch
# User Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
# Date 2019-07-06 23:55:29
# 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 --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -68,6 +68,8 @@ grep.all-files = True
 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