mercurial/tagmerge.py
changeset 48875 6000f5b25c9b
parent 47012 d55b71393907
equal deleted inserted replaced
48874:af0b21d5a930 48875:6000f5b25c9b
    69 #           merged tags file
    69 #           merged tags file
    70 #     - sort the "tag blocks" according to their associated number line
    70 #     - sort the "tag blocks" according to their associated number line
    71 #         - put blocks whose nodes come all from p2 first
    71 #         - put blocks whose nodes come all from p2 first
    72 #     - write the tag blocks in the sorted order
    72 #     - write the tag blocks in the sorted order
    73 
    73 
    74 from __future__ import absolute_import
       
    75 
    74 
    76 from .i18n import _
    75 from .i18n import _
    77 from . import (
    76 from . import (
    78     tags as tagsmod,
    77     tags as tagsmod,
    79     util,
    78     util,