D4379: resolve: add config to make hg resolve not re-merge by default

[durin42 (Augie Fackler)]

durin42 added a comment.


  >   I like the feature it introduces. Thanks for coding this up. This looks like a good candidate for `ui.tweakdefaults`, @durin42 what do you think?
  
  I think I’m generally fine with that.

REPOSITORY
  rHG Mercurial

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

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