diff -r af0b21d5a930 -r 6000f5b25c9b mercurial/mergestate.py --- a/mercurial/mergestate.py Sun Feb 20 15:18:15 2022 -0700 +++ b/mercurial/mergestate.py Thu Mar 03 17:34:00 2022 +0100 @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import collections import errno import shutil