Invoke ediff to resolve the conflicts. NAME-MINE, NAME-OTHER, and NAME-BASE, if non-nil, are used for the buffer names. (fn &optional NAME-MINE NAME-OTHER NAME-BASE)