mercurial/diffutil.py
changeset 48875 6000f5b25c9b
parent 45942 89a2afe31e82
child 49898 024e0580b853
child 50247 b8cac4e37100
equal deleted inserted replaced
48874:af0b21d5a930 48875:6000f5b25c9b
     5 # Copyright 2018 Octobus <octobus@octobus.net>
     5 # Copyright 2018 Octobus <octobus@octobus.net>
     6 #
     6 #
     7 # This software may be used and distributed according to the terms of the
     7 # This software may be used and distributed according to the terms of the
     8 # GNU General Public License version 2 or any later version.
     8 # GNU General Public License version 2 or any later version.
     9 
     9 
    10 from __future__ import absolute_import
       
    11 
    10 
    12 from .i18n import _
    11 from .i18n import _
    13 
    12 
    14 from . import (
    13 from . import (
    15     mdiff,
    14     mdiff,