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

后端 未结 6 1223
一整个雨季
一整个雨季 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:07

    So that filenames with spaces are handled correctly, you should change the last line of @melbourn's answer to

    cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -base "$BASE" -theirs "$REMOTE" -mine "$LOCAL" -merged "$MERGED"
    

提交回复
热议问题