mercurial/simplemerge.py
changeset 48565 7ed4c4753891
parent 48564 c2537aec3bb6
child 48566 50de08904c63
equal deleted inserted replaced
48564:c2537aec3bb6 48565:7ed4c4753891
    23     error,
    23     error,
    24     mdiff,
    24     mdiff,
    25     pycompat,
    25     pycompat,
    26 )
    26 )
    27 from .utils import stringutil
    27 from .utils import stringutil
    28 
       
    29 
       
    30 class CantReprocessAndShowBase(Exception):
       
    31     pass
       
    32 
    28 
    33 
    29 
    34 def intersect(ra, rb):
    30 def intersect(ra, rb):
    35     """Given two ranges return the range where they intersect or None.
    31     """Given two ranges return the range where they intersect or None.
    36 
    32