Meld in git

Diff viewer:

%MELD_HOME%\Meld\Meld.exe %base %mine

Merge tool:

%MELD_HOME%\Meld\Meld.exe --auto-merge %theirs  %base %mine -o %merged