merge: hint about using `hg resolve` for resolving conflicts...
merge: hint about using `hg resolve` for resolving conflicts
This was suggested by one of our users at Google. Makes sense to me.
Differential Revision:
https://phab.mercurial-scm.org/D6755