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():