Explicitly choose diff and merge tools