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

后端 未结 6 1231
一整个雨季
一整个雨季 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 20:57

    [diff]
      tool = tortoisediff
    [difftool]
      prompt = false
    [merge]
      tool = tortoisemerge
    [mergetool]
      prompt = false
      keepBackup = false
    [difftool "tortoisediff"]
      cmd = \""C:/Users/$USER/Desktop/TortoiseMerge.exe"\" -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
    [mergetool "tortoisemerge"]
      cmd = \""C:/Users/$USER/Desktop/TortoiseMerge.exe"\" -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
    

    This worked for me, using TortoiseMerge 1.6.7 (Portable)

提交回复
热议问题