First, Download and install the newest version of Meld for Windows. https://download.gnome.org/binaries/win32/meld/
Next we need to edit your .gitconfig file. This file lives as a hidden file in your user directory. Here is a sample of mine:
[user]
email = [email protected]
name = Sir Kuttin
[merge]