Your comments

I don't think a proper configuration option is needed here, silently remembering the last selected merge option (per repository?) would be nice though.