Use kdiff3 as diff/merge tool