Make Beyond Compare 4 a default diff/merge tool