##// END OF EJS Templates
filemerge: remove unused `repo` argument from `_maketempfiles()`...
Martin von Zweigbergk -
r49630:8dd5853e default
parent child Browse files
Show More
@@ -745,7 +745,7 b' def _xmerge(repo, mynode, local, other, '
745 745 args = _toolstr(repo.ui, tool, b"args")
746 746
747 747 with _maketempfiles(
748 repo, fco, fca, repo.wvfs.join(backup.path()), b"$output" in args
748 fco, fca, repo.wvfs.join(backup.path()), b"$output" in args
749 749 ) as temppaths:
750 750 basepath, otherpath, localoutputpath = temppaths
751 751 outpath = b""
@@ -921,7 +921,7 b' def _makebackup(repo, ui, wctx, fcd):'
921 921
922 922
923 923 @contextlib.contextmanager
924 def _maketempfiles(repo, fco, fca, localpath, uselocalpath):
924 def _maketempfiles(fco, fca, localpath, uselocalpath):
925 925 """Writes out `fco` and `fca` as temporary files, and (if uselocalpath)
926 926 copies `localpath` to another temporary file, so an external merge tool may
927 927 use them.
General Comments 0
You need to be logged in to leave comments. Login now