test: update conformance snapshots for merge conflict diagnostics - #15462

test: update conformance snapshots for merge conflict diagnostics#15462

sapphi-red merged 2 commits into

c/11-04-feat_parser_improve_diagnostic_messages_for_merge_conflictsoxc-project/oxc:c/11-04-feat_parser_improve_diagnostic_messages_for_merge_conflictsfrom

copilot/sub-pr-15443oxc-project/oxc:copilot/sub-pr-15443Copy head branch name to clipboard