Set kdiff3 as default merge editor