D4378: resolve: add a flag for the default behavior of re-merging

[pulkit (Pulkit Goyal)]

pulkit accepted this revision.
pulkit added a comment.


  > I added a couple of simple tests. I could add one for the hint, but I figured it's probably not worth it?
  
  I *think* each case is worth a test and help us increasing code coverage.

REPOSITORY
  rHG Mercurial

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

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