comparison mercurial/merge.py @ 48875:6000f5b25c9b

py2: remove simple from __future__ statements

These were needed for Python 2 support. Now that our linter no longer
mandates these, we can start deleting them.

Differential Revision: https://phab.mercurial-scm.org/D12254

48874:af0b21d5a930

# Copyright 2006, 2007 Olivia Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

import collections
import errno
import struct

48875:6000f5b25c9b

# Copyright 2006, 2007 Olivia Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.


import collections
import errno
import struct