changeset 48783 | 218154867575 |
parent 48782 | c7dbfc363655 |
child 48784 | 9d0d0a388c39 |
--- a/mercurial/filemerge.py Fri Feb 11 21:39:55 2022 -0800 +++ b/mercurial/filemerge.py Fri Feb 11 22:39:53 2022 -0800 @@ -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""