using kdiff3 for merge and diff tools