merge: use public interface ms.localctx instead of ms._local

mercurial/hg.py

@@ -15,7 +15,6 b' import shutil'
 
 from .i18n import _
 from .node import (
-    hex,
     nullid,
 )
 
@@ -858,7 +857,7 b' def merge(repo, node, force=None, remind'
         ms = mergemod.mergestate.read(repo)
         if ms.active():
             # there were conflicts
-            node = hex(ms._local)
+            node = ms.localctx.hex()
         else:
             # there were no conficts, mergestate was not stored
             node = repo['.'].hex()