Add back the diff.tool setting