Simplify diff and merge tool configs