uses diff3 as default