Add `theirs` option to merge strategy

Because `subtree` is really `recursive` under the hood, we can use options from that strategy.