Differences
This shows you the differences between the selected revisions of the page.
| 2022-10-21 | 2024-03-25 | ||
| link update (martin) | Issue 2279 – Support TortoiseMerge in Compare Files extension (martin) | ||
| 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 39: | ||
| ("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") | ||
| ) | ) | ||