filemerge: remove an unnecessary join with absolute path
The `backup` path is now always absolute, so we don't need to join it
with the working copy path.
Differential Revision: https://phab.mercurial-scm.org/D12188
--- 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""