Differences
This shows you the differences between the selected revisions of the page.
| extension_compare_files 2018-11-06 | extension_compare_files 2024-03-25 (current) | ||
| Line 2: | Line 2: | ||
| This extension launches an external [[https://en.wikipedia.org/wiki/Comparison_of_file_comparison_tools|file comparison tool]] for files selected in [[ui_file_panel|local and remote file panels]]. | This extension launches an external [[https://en.wikipedia.org/wiki/Comparison_of_file_comparison_tools|file comparison tool]] for files selected in [[ui_file_panel|local and remote file panels]]. | ||
| - | The extension recognizes the following file comparison tools: [[https://www.prestosoft.com/edp_examdiffpro.asp|ExamDiff Pro]], [[https://www.scootersoftware.com/|Beyond Compare]], [[http://kdiff3.sourceforge.net/|KDiff3 ]], [[http://winmerge.org/|WinMerge]] and built-in Windows command-line ''[[https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/fc|fc]]''. | + | The extension recognizes the following file comparison tools: [[https://www.prestosoft.com/edp_examdiffpro.asp|ExamDiff Pro]], [[https://www.scootersoftware.com/|Beyond Compare]], [[https://kdiff3.sourceforge.net/|KDiff3 ]], [[https://winmerge.org/|WinMerge]], [[https://tortoisesvn.net/TortoiseMerge.html|TortoiseMerge]] and built-in Windows command-line ''[[https://learn.microsoft.com/en-us/windows-server/administration/windows-commands/fc|fc]]''. |
| - | This is an official [[extension|WinSCP extension]] and is distributed in WinSCP installer //with the latest beta version//. &beta | + | This is an official [[extension|WinSCP extension]] and is distributed in WinSCP installer. |
| <code powershell - CompareFiles.ps1> | <code powershell - CompareFiles.ps1> | ||
| Line 14: | Line 14: | ||
| # @flag ShowResultsInMsgBox | # @flag ShowResultsInMsgBox | ||
| # @flag ApplyToDirectories | # @flag ApplyToDirectories | ||
| - | # @version 1 | + | # @version 2 |
| # @shortcut Shift+Ctrl+Alt+C | # @shortcut Shift+Ctrl+Alt+C | ||
| # @homepage ~~SELF~~ | # @homepage ~~SELF~~ | ||
| Line 20: | Line 20: | ||
| # @option - group "Options" | # @option - group "Options" | ||
| # @option Tool dropdownlist "Select &file comparison tool:" "" ^ | # @option Tool dropdownlist "Select &file comparison tool:" "" ^ | ||
| - | # "=Automatic" "ExamDiff Pro" "Beyond Compare" "KDiff3" "WinMerge" "fc" | + | # "=Automatic" "ExamDiff Pro" "Beyond Compare" "KDiff3" "WinMerge" ^ |
| + | # "TortoiseMerge" "fc" | ||
| # @optionspage ~~SELF~~#options | # @optionspage ~~SELF~~#options | ||
| Line 39: | Line 40: | ||
| ("KDiff3", "$pf\KDiff3\kdiff3.exe"), | ("KDiff3", "$pf\KDiff3\kdiff3.exe"), | ||
| ("WinMerge", "$pf\WinMerge\WinMergeU.exe"), | ("WinMerge", "$pf\WinMerge\WinMergeU.exe"), | ||
| + | ("TortoiseMerge", "$pf\\TortoiseSVN\bin\TortoiseMerge.exe"), | ||
| ("fc", "fc.exe") | ("fc", "fc.exe") | ||
| ) | ) | ||
| Line 91: | Line 93: | ||
| { | { | ||
| Start-Process $env:ComSpec ` | Start-Process $env:ComSpec ` | ||
| - | -ArgumentList "/c", $path, $localPath, $remotePath, "&", "pause" -Wait | + | -ArgumentList "/c $path `"$localPath`" `"$remotePath`" &·pause" -Wait |
| } | } | ||
| else | else | ||
| { | { | ||
| - | Start-Process $path -ArgumentList $localPath, $remotePath -Wait | + | Start-Process $path -ArgumentList "`"$localPath`" `"$remotePath`"" -Wait |
| } | } | ||