These instructions are only for Git. How do I do this with Mercurial?

[Aru Sahni]

This question is in reference to Atlassian Documentation: Resolve merge conflicts

Ask your question here...

[ben-dean-ontsys]

There is a decent tutorial on resolving merge conflicts in the Mercurial wiki. But the Bitbucket documentation in question really needs to talk about how to do this in Mercurial too.