D6609: tweakdefaults: make hg resolve require --re-merge flag to re-merge

[valentin.gatienbaron (Valentin Gatien-Baron)]

valentin.gatienbaron created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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`.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6609

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
@@ -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



To: valentin.gatienbaron, #hg-reviewers
Cc: mercurial-devel