smartgit配置beyond compare作为对比工具

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

posted @ 2020-05-11 19:56  多弗朗强哥  阅读(186)  评论(0编辑  收藏  举报