# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1642698279 28800
# Node ID 62682662346ce39844eac19a91671cfa501053b3
# Parent  1a84758b4fcacfa4df614802bfe0b515a43a26c5
filemerge: make `labels` a required arg for `_premerge()`

We always pass labels, and it's always a non-empty list, so we can
simplify a bit.

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

diff -r 1a84758b4fca -r 62682662346c mercurial/filemerge.py
--- 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'