Fix a couple diff/merge tool settings