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

问题描述

我正在尝试将 CodeCompare 设置为我的 git 合并/差异工具，但是我不断收到错误消息，即我的 .gitconfig 文件中的以下行不正确，我在使用 msysgit 的 Windows 上

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 FilesDevartCode Comparecodemerge.exe" "/TF=$REMOTE" "/MF=$LOCAL" "/RF=$MERGED" "/BF=$BASE"

我的合并部分如下所示

[merge]
tool = codecompare
[mergetool "codecompare"]
cmd = "C:Program FilesDevartCode Comparecodemerge.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屋！