Mercurial > hg

changeset 35713:7ffbd911dbc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use public interface ms.localctx instead of ms._local
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 18 Jan 2018 19:40:17 +0530
parents a1a5c3842b6f
children 113281667205
files mercurial/hg.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Tue Jan 16 14:28:57 2018 +0100
+++ b/mercurial/hg.py	Thu Jan 18 19:40:17 2018 +0530
@@ -15,7 +15,6 @@
 
 from .i18n import _
 from .node import (
-    hex,
     nullid,
 )
 
@@ -858,7 +857,7 @@
         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()