# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1644647993 28800
# Node ID 2181548675756686a5b84e80e498061d02672d95
# Parent  c7dbfc3636556ddabb93b2315c9da47e19c86e78
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

diff -r c7dbfc363655 -r 218154867575 mercurial/filemerge.py
--- 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""