Mercurial > hg
changeset 43845:1ffbd03c8d75
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
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Wed, 20 Nov 2019 13:01:56 -0500 |
| parents | b7af8a02a304 |
| children | d5ce99a6db52 |
| files | mercurial/filemerge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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():