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

后端 未结 6 1173
一整个雨季
一整个雨季 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条回答
  •  梦毁少年i
    2021-01-30 21:05

    The following settings work fine for me. However, I am using TortoiseGit not TortoiseSVN. Notice the difference in the parameters for diff.

    [diff]
      tool = tortoisediff
    [difftool]
      prompt = false
    [merge]
      tool = tortoisemerge
    [mergetool]
      prompt = false
      keepBackup = false
    [difftool "tortoisediff"]
      cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -mine "$REMOTE" -base "$LOCAL"
    [mergetool "tortoisemerge"]
      cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -base "$BASE" -theirs "$REMOTE" -mine "$LOCAL" -merged "$MERGED"
    

提交回复
热议问题