contrib/simplemerge

--- a/contrib/simplemerge	Fri Jan 07 22:23:44 2022 -0800
+++ b/contrib/simplemerge	Fri Jan 07 23:29:19 2022 -0800
@@ -83,6 +83,10 @@
     if len(opts[b'label']) > 2:
         opts[b'mode'] = b'merge3'
     local, base, other = args
+    overrides = opts[b'label']
+    labels = [local, other, base]
+    labels[: len(overrides)] = overrides
+    opts[b'label'] = labels
     sys.exit(
         simplemerge.simplemerge(
             uimod.ui.load(),