diff -r af0b21d5a930 -r 6000f5b25c9b mercurial/merge.py --- a/mercurial/merge.py Sun Feb 20 15:18:15 2022 -0700 +++ b/mercurial/merge.py Thu Mar 03 17:34:00 2022 +0100 @@ -5,7 +5,6 @@ # 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