Mercurial > public > mercurial-scm > hg-stable
diff contrib/simplemerge @ 48588:6ad70879d2bd
simplemerge: move default labels to simplemerge extension
I want to remove knowledge of paths from the `simplemerge` core
module. As part of that, let's move the default labels from the core
module to the extension.
Differential Revision: https://phab.mercurial-scm.org/D11977
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 07 Jan 2022 23:29:19 -0800 |
| parents | c91418480cb0 |
| children | 77e24ee8994b |
line wrap: on
line diff
--- 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(),