# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1574272916 18000
# Node ID 1ffbd03c8d75ef35ca8172a2879b464227d43b08
# Parent  b7af8a02a304786b5757c460c99b22508813f673
filemerge: drop a default argument to appease pytype

The function slices and takes the length of this argument without internally
setting it if not provided.  There was no bug here because both callers passed
the argument.

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

diff -r b7af8a02a304 -r 1ffbd03c8d75 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Tue Dec 10 19:04:53 2019 -0500
+++ b/mercurial/filemerge.py	Wed Nov 20 13:01:56 2019 -0500
@@ -693,7 +693,7 @@
     ui.status(t.renderdefault(props))
 
 
-def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
+def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels):
     tool, toolpath, binary, symlink, scriptfn = toolconf
     uipathfn = scmutil.getuipathfn(repo)
     if fcd.isabsent() or fco.isabsent():