Update diff/merge tool config