--- a/mercurial/filemerge.py Thu Jan 20 14:46:16 2022 -0800
+++ b/mercurial/filemerge.py Thu Jan 20 09:04:39 2022 -0800
@@ -399,7 +399,7 @@
return filectx
-def _premerge(repo, fcd, fco, fca, toolconf, backup, labels=None):
+def _premerge(repo, fcd, fco, fca, toolconf, backup, labels):
tool, toolpath, binary, symlink, scriptfn = toolconf
if symlink or fcd.isabsent() or fco.isabsent():
return 1
@@ -421,8 +421,6 @@
)
if premerge:
- if not labels:
- labels = _defaultconflictlabels
if len(labels) < 3:
labels.append(b'base')
mode = b'merge'