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

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> commands.py:4912
>          labels = [b'working copy', b'merge rev']
> -        return hg.merge(
> -            repo, node, force=force, labels=labels
> -        )
> +        return hg.merge(repo, node, force=force, labels=labels)
>  

This seems like unrelated change and should be part of previous 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