Git合并/比较工具设置 [英] Git merge/compare tool setup

问题描述

我试图设置CodeCompare作为我的git合并/ diff工具，但我不断得到一个错误，下面的行是不正确的.gitconfig文件，我在Windows使用msysgit

I'm trying to setup CodeCompare as my git merge/diff tool, however I keep getting an error that the following line is incorrect in my .gitconfig file, I am on windows using msysgit

 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

推荐答案

我实际上发现这更好。

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

这篇关于Git合并/比较工具设置的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！