Fix a panic in merge conflict parsing (#32119)

Release Notes:

- Fixed a panic that could occur when editing files containing merge
conflicts.
9c7b1d19ceCole Miller committed on 6/5/2025, 12:05:26 AM· committed by GitHubparent3d98811
1 file changedLine totals unavailable