--- a/contrib/simplemerge Sun Feb 20 15:18:15 2022 -0700 +++ b/contrib/simplemerge Thu Mar 03 17:34:00 2022 +0100 @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -from __future__ import absolute_import import getopt import sys