====== Git@Windows ====== * download & install git /windows * download & install meld * download puttygen git config --global merge.tool meld git config --global mergetool.meld.path "C:\Program Files (x86)\Meld\Meld.exe"