Introduce diff3 mode for checking out conflicts