Skip to content
Snippets Groups Projects
Commit 62682662 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

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
parent 1a84758b
No related branches found
No related tags found
No related merge requests found
......@@ -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'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment