Patchwork D7464: filemerge: drop a default argument to appease pytype

login
register
mail settings
Submitter phabricator
Date Dec. 11, 2019, 6:30 p.m.
Message ID <f6cdbed8fd71559c61ea39dbc7d39d71@localhost.localdomain>
Download mbox | patch
Permalink /patch/43724/
State Not Applicable
Headers show

Comments

phabricator - Dec. 11, 2019, 6:30 p.m.
Closed by commit rHG1ffbd03c8d75: filemerge: drop a default argument to appease pytype (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7464?vs=18254&id=18619

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7464/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7464

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: dlax, mercurial-devel

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -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():