diff contrib/simplemerge @ 48555:c91418480cb0

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels

Before this patch, we use a combination of `mode` and `labels` to
decide which marker style to use. That's mostly my own fault because I
was the one who added the `mergediff` as a "mode" instead of adding a
separate argument for marker style. Still, let's make these arguments
more orthogonal by ignoring the number of labels when deciding which
marker style to use.

This refactoring makes it a little clearer in the simplemerge
*extension* that passing more than 2 `--label` arguments changes the
marker style.

Differential Revision: https://phab.mercurial-scm.org/D11972

--- 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(