Configuring your diff tool

This guide was posted by @Grumpdev in the Code52 chatroom

git config --global merge.tool

git config merge.tool mymerge
git config merge.mymerge.cmd 'mymerge.exe --base "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"'