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.
$HOME/.gitconfig
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"