[2/n] handle unparseable local files (e.g., conflict markers)#39

sunshowers wants to merge 4 commits intosunshowers/spr/main.2n-handle-unparseable-local-files-eg-merge-conflict-markersoxidecomputer/dropshot-api-manager:sunshowers/spr/main.2n-handle-unparseable-local-files-eg-merge-conflict-markersfrom

sunshowers/spr/2n-handle-unparseable-local-files-eg-merge-conflict-markersoxidecomputer/dropshot-api-manager:sunshowers/spr/2n-handle-unparseable-local-files-eg-merge-conflict-markersCopy head branch name to clipboard