+15

Automatically detect merge conflict markers (>>>>>) and paint them as red regions in the minimap

Patrick Corcoran 8 years ago 0
When a file has merge conflict markers in it (eg. >>>>>>>) it would be helpful to see these displayed in the minimap.  Perhaps displayed with a red background instead of white/gray.