diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -745,7 +745,7 @@ args = _toolstr(repo.ui, tool, b"args") with _maketempfiles( - fco, fca, repo.wvfs.join(backup.path()), b"$output" in args + fco, fca, backup.path(), b"$output" in args ) as temppaths: basepath, otherpath, localoutputpath = temppaths outpath = b""