GIT Three way merge

Download meld Install meld from here

Using meld git merge

git config --global merge.tool meld

git config --global mergetool.meld.path "C:/Program Files (x86)/Meld/Meld.exe"

Using meld for git diff

create file diffTool.sh with following content

#!/bin/bash

"/c/Program Files (x86)/Meld/Meld.exe" $2 $5

git config --global diff.external ~/diffTool.sh