Git合併/比較工具設置

我想設置CodeCompare作爲我的git合併/ diff工具，但是我不斷收到一個錯誤，我的.gitconfig文件中的以下行不正確，我在windows上使用msysgitGit合併/比較工具設置

cmd = "C:\Program Files\Devart\Code Compare\codemerge.exe" "/TF=$REMOTE" "/MF=$LOCAL" "/RF=$MERGED" "/BF=$BASE"

我的合併部分看起來如下

[merge] 
tool = codecompare 
[mergetool "codecompare"] 
cmd = "C:\Program Files\Devart\Code Compare\codemerge.exe" "/TF=$REMOTE" "/MF=$LOCAL" "/RF=$MERGED" "/BF=$BASE" 
keepBackup = false 
trustExitCode = false

有我丟失的東西？

來源

2012-03-09 Daniel Powell

你有沒有試着用'TF = 「$ REMOTE」/ MF =「$ LOCAL 「/ BF =」$ BASE「/ RF =」$ MERGED「/ REMOVEFILES/B'？ – VonC 2012-03-09 07:48:53

我居然發現這個工作得更好

http://mnaoumov.wordpress.com/2012/09/13/git-devart-codecompare-integration/

[diff] 
    tool = codecompare 
    guitool = codecompare 
[merge] 
    tool = codecompare 
[mergetool] 
    keepBackup = false 
[difftool "codecompare"] 
    cmd = 'C:/Program Files/Devart/Code Compare/CodeCompare.exe' \"$LOCAL\" \"$REMOTE\" 
    renames = true 
[mergetool "codecompare"] 
    cmd = 'C:/Program Files/Devart/Code Compare/CodeMerge.exe' -MF=\"$LOCAL\" -TF=\"$REMOTE\" -BF=\"$BASE\" -RF=\"$MERGED\" 
    trustExitCode = true

來源

2012-11-04 22:50:52

嘗試以下配置：

[difftool "codecompare"] 
    cmd = 'C:\\Program Files\\Devart\\Code Compare\\codecompare.exe' "$LOCAL" "$REMOTE" 
    renames = true 
[diff] 
    tool = codecompare 
[mergetool "codecompare"] 
    cmd = 'C:\\Program Files\\Devart\\Code Compare\\codemerge.exe' /MF="$LOCAL" /TF="$REMOTE" /BF="$BASE" /RF="$MERGED" 
    trustExitCode = true 
[mergetool] 
    keepBackup = false 
[merge] 
    tool = codecompare

來源

2012-03-12 11:52:18 Devart

這對我而言並不適用。它在兩個'cmd'參數中轉義雙引號後仍然有效。 – 2012-07-27 14:17:34

在此處查看解決方法 - [使用CodeMerge和Git Bash]（http://forums.devart.com/viewtopic.php?f=36&t=24463）。 – Devart 2012-07-27 14:32:30

Git合併/比較工具設置

回答

相關問題