Git Merge Tool Kdiff3