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