DiffMerge在第三方工具中命令配置
一、TortoiseSVN
TortoiseSVN中配置详细信息请参考 :https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-settings.html#tsvn-dug-settings-progs
命令:/m /r=%merged /t1=%yname /t2=%bname /t3=%tname /c=%mname %mine %base %theirs
完整带路径名称 :D:\xxxx\DiffMerge\sgdm.exe /m /r=%merged /t1=%yname /t2=%bname /t3=%tname /c=%mname %mine %base %theirs
TortoiseGit 和 TortoiseSVN的上述配置都能生效
二、TFS
vs里选择工具->设置->源代码控制
命令:/m /r=%4 /t1=%7 /t2=%8 /t3=%6 /c=%9 %2 %3 %1
完整带路径名称 :D:\xxxx\DiffMerge\sgdm.exe /m /r=%4 /t1=%7 /t2=%8 /t3=%6 /c=%9 %2 %3 %1
三、VSS
命令:C:\xxxx\DiffMerge\sgdm.exe /t1="source branch" /t2="base version" /t3="destination branch" /result=%4 %1 %3 %2
四、FORK
设置如下所示:
Merge Arguments: "$LOCAL" "$MERGED" "$REMOTE"
Diff Arguments: "$REMOTE" "$LOCAL"
参考网址:https://www.sourcegear.com/diffmerge/webhelp/chapter_integration.html