Show More
@@ -15,7 +15,6 b' import shutil' | |||
|
15 | 15 | |
|
16 | 16 | from .i18n import _ |
|
17 | 17 | from .node import ( |
|
18 | hex, | |
|
19 | 18 | nullid, |
|
20 | 19 | ) |
|
21 | 20 | |
@@ -858,7 +857,7 b' def merge(repo, node, force=None, remind' | |||
|
858 | 857 | ms = mergemod.mergestate.read(repo) |
|
859 | 858 | if ms.active(): |
|
860 | 859 | # there were conflicts |
|
861 |
node = hex( |
|
|
860 | node = ms.localctx.hex() | |
|
862 | 861 | else: |
|
863 | 862 | # there were no conficts, mergestate was not stored |
|
864 | 863 | node = repo['.'].hex() |
General Comments 0
You need to be logged in to leave comments.
Login now