Diff
Select Edit | Preferences.
Go to Tools > Diff Tools.
Click Add.
File Pattern: *
Select External diff tool.
Command: C:\Program Files (x86)\Beyond Compare 4\bcomp.exe [ 如果是 Linux 参考: “/usr/bin/bcompare” ]
Arguments: /readonly /lefttitle="\({leftTitle}" /righttitle="\){rightTitle}" "\({leftFile}" "\){rightFile}"
Merge
Select Edit | Preferences.
Go to Tools > Conflict Solvers.
Click Add.
File Pattern: *
Select External Conflict Solver.
Command: C:\Program Files (x86)\Beyond Compare 4\bcomp.exe
Arguments: "\({leftFile}" "\){rightFile}" "\({baseFile}" /mergeoutput="\){mergedFile}"
参考链接:
https://blog.csdn.net/u010620626/article/details/78818687