TortoiseSVN 设置对比工具为 IDEA

关键参数

// 🦗 Diff tools
{idea-path} diff %mine %base

// 🐝 Merge tools
{idea-path} merge %mine %theirs %base %merged

以上命令参考自

• Compare files from the command line - IntelliJ IDEA
• Merge files from the command line - IntelliJ IDEA

TortoiseSVN 提供了以下值供外部使用

Diff tools

• %base 没更改的原始文件
• %mine 你更改过的新文件

> 查看更多

Merge tools

• %base 没有被你或他人更改的原始文件
• %mine 你更改过的新文件
• %theirs 档案库中存放的文件
• %merged 发生冲突的文件，同时将被合并后的文件替换

> 查看更多

设置方法

通过以下路径设置

Diff tools

TortoiseSVN -> Settings -> Diff Viewer -> External

Merge tools

TortoiseSVN -> Settings -> Diff Viewer -> Merge Tool -> External

参考

• Could I configure IntelliJ diff viewer/merge tool as external tools in tortoiseSVN? - Stack Overflow