Git Merge Tool Kdiff3 Help