D8168: merge: introduce a merge() for that use-case

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  Moved formatting fix to parent patch

REPOSITORY
  rHG Mercurial

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

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

To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel