TortoiseGit:
git config --global diff.tool tortoisediff
git config --global difftool.tortoisediff.cmd “TortoiseGitMerge $LOCAL $REMOTE”
git config --global difftool.tortoisediff.path “C:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe”
TortoiseGit:
git config --global diff.tool tortoisediff
git config --global difftool.tortoisediff.cmd “TortoiseGitMerge $LOCAL $REMOTE”
git config --global difftool.tortoisediff.path “C:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe”