mercurial/merge.py
changeset 48875 6000f5b25c9b
parent 48805 d4486810a179
child 48913 f254fc73d956
equal deleted inserted replaced
48874:af0b21d5a930 48875:6000f5b25c9b
     3 # Copyright 2006, 2007 Olivia Mackall <olivia@selenic.com>
     3 # Copyright 2006, 2007 Olivia Mackall <olivia@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 or any later version.
     6 # GNU General Public License version 2 or any later version.
     7 
     7 
     8 from __future__ import absolute_import
       
     9 
     8 
    10 import collections
     9 import collections
    11 import errno
    10 import errno
    12 import struct
    11 import struct
    13 
    12