mercurial/filemerge.py
changeset 48783 218154867575
parent 48782 c7dbfc363655
child 48784 9d0d0a388c39
equal deleted inserted replaced
48782:c7dbfc363655 48783:218154867575
   743         return False, 1, None
   743         return False, 1, None
   744     localpath = _workingpath(repo, fcd)
   744     localpath = _workingpath(repo, fcd)
   745     args = _toolstr(repo.ui, tool, b"args")
   745     args = _toolstr(repo.ui, tool, b"args")
   746 
   746 
   747     with _maketempfiles(
   747     with _maketempfiles(
   748         fco, fca, repo.wvfs.join(backup.path()), b"$output" in args
   748         fco, fca, backup.path(), b"$output" in args
   749     ) as temppaths:
   749     ) as temppaths:
   750         basepath, otherpath, localoutputpath = temppaths
   750         basepath, otherpath, localoutputpath = temppaths
   751         outpath = b""
   751         outpath = b""
   752 
   752 
   753         def format_label(input):
   753         def format_label(input):