mercurial/mdiff.py
branchstable
changeset 10263 25e572394f5c
parent 10185 7637fe4f525d
child 10264 d6512b3e9ac0
equal deleted inserted replaced
10262:eb243551cbd8 10263:25e572394f5c
     1 # mdiff.py - diff and patch routines for mercurial
     1 # mdiff.py - diff and patch routines for mercurial
     2 #
     2 #
     3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
     3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
     4 #
     4 #
     5 # This software may be used and distributed according to the terms of the
     5 # This software may be used and distributed according to the terms of the
     6 # GNU General Public License version 2, incorporated herein by reference.
     6 # GNU General Public License version 2 or any later version.
     7 
     7 
     8 from i18n import _
     8 from i18n import _
     9 import bdiff, mpatch, util
     9 import bdiff, mpatch, util
    10 import re, struct
    10 import re, struct
    11 
    11