contrib/simplemerge

--- a/contrib/simplemerge	Fri Jan 14 10:25:45 2022 -0800
+++ b/contrib/simplemerge	Tue Dec 14 13:12:56 2021 -0800
@@ -80,6 +80,8 @@
         sys.exit(0)
     if len(args) != 3:
         raise ParseError(_(b'wrong number of arguments').decode('utf8'))
+    if len(opts[b'label']) > 2:
+        opts[b'mode'] = b'merge3'
     local, base, other = args
     sys.exit(
         simplemerge.simplemerge(