changed diff/merge tool settings