mercurial/filemerge.py
changeset 50929 18c8c18993f0
parent 50923 c642c03969ff
equal deleted inserted replaced
50928:d718eddf01d9 50929:18c8c18993f0
    13 
    13 
    14 from .i18n import _
    14 from .i18n import _
    15 from .node import (
    15 from .node import (
    16     hex,
    16     hex,
    17     short,
    17     short,
    18 )
       
    19 from .pycompat import (
       
    20     getattr,
       
    21 )
    18 )
    22 
    19 
    23 from . import (
    20 from . import (
    24     encoding,
    21     encoding,
    25     error,
    22     error,