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

[valentin.gatienbaron (Valentin Gatien-Baron)]

valentin.gatienbaron added a comment.


  Thanks for accepting (some of) my other changes.
  I added a couple of simple tests. I could add one for the hint, but I figured it's probably not worth it?

REPOSITORY
  rHG Mercurial

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

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