--- a/contrib/simplemerge Mon Nov 09 09:58:44 2020 -0800 +++ b/contrib/simplemerge Fri Nov 06 13:58:59 2020 -0800 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import import getopt