Can TortoiseMerge be used as a difftool with Windows Git Bash?

后端 未结 6 1224
一整个雨季
一整个雨季 2021-01-30 20:37

I\'m just starting to work with Git. I would like to use TortoiseMerge as the difftool and mergetool.

In my $HOME/.gitconfig I have the following sections.

6条回答
  •  没有蜡笔的小新
    2021-01-30 21:11

    For using the TortoiseMerge with an existing TortoiseSVN installation in Windows:

    [guitool "VisualDiff"]
        cmd = git difftool -y \"$FILENAME\"
        needsfile = yes
        noconsole = yes
    [diff]
        tool = tortoisediff
    [difftool]
        prompt = false
    [merge]
        tool = tortoisemerge
    [mergetool]
        prompt = false
        keepBackup = false
    [difftool "tortoisediff"]
        cmd = \""W:/Programs/TortoiseSVN/bin/TortoiseMerge.exe"\" "/mine:$REMOTE" "/base:$LOCAL"
    [mergetool "tortoisemerge"]
        cmd = \""W:/Programs/TortoiseSVN/bin/TortoiseMerge.exe"\" "/base:$BASE" "/theirs:$REMOTE" "/mine:$LOCAL" "/merged:$MERGED"
    

提交回复
热议问题