equal
deleted
inserted
replaced
13 import os |
13 import os |
14 import shutil |
14 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 |
22 from . import ( |
21 from . import ( |
23 bookmarks, |
22 bookmarks, |
856 labels=labels) |
855 labels=labels) |
857 else: |
856 else: |
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(ms._local) |
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() |
865 |
864 |
866 repo.ui.status(_("aborting the merge, updating back to" |
865 repo.ui.status(_("aborting the merge, updating back to" |