TortoiseGit Mergetool

Setting Up TortoiseGit as a Merge Tool

• Download TortoiseGit
• Run in git bash:

git config --global mergetool.tortoisemerge.cmd '"C:/Program Files/TortoiseGit/bin/TortoiseGitMerge.exe" -base:"$BASE" -theirs:"$REMOTE" -mine:"$LOCAL" -merged:"$MERGED"'

as well as

git config merge.tool tortoisemerge

To open and use the tool to resolve merge conflicts:

git mergetool