Patchwork D6610: tweakdefaults: make hg resolve require --re-merge flag to re-merge

login
register
mail settings
Submitter phabricator
Date July 8, 2019, 1:11 p.m.
Message ID <ce422e615cf417f415617c6784a63622@localhost.localdomain>
Download mbox | patch
Permalink /patch/40808/
State Not Applicable
Headers show

Comments

phabricator - July 8, 2019, 1:11 p.m.
Closed by commit rHG44e99811bea7: tweakdefaults: make hg resolve require --re-merge flag to re-merge (authored by valentin.gatienbaron).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6610?vs=15786&id=15790

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6610/new/

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

AFFECTED FILES
  mercurial/ui.py

CHANGE DETAILS




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

Patch

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