I would prefer lower case strategy names using "-" instead of "_" this is easier to type and read and native git does it similarly.

ours, theirs, simple-two-way-in-core

simple-two-way-in-core sounds weird as a strategy name.

I think the semantics of these strategies should be also shortly described.