Add `Option::merge` under `option_merge` feature gate#84695

WaffleLapkin wants to merge 1 commit intorust-lang:masterrust-lang/rust:masterfrom

WaffleLapkin:option_mergeWaffleLapkin/rust:option_mergeCopy head branch name to clipboard