[Feature Request] Display area of merge conflict in minimap

[r0ckarong]

Hi, I would love to see an option in minimap to highlight the area of a merge conflict in the minimap. Typically I can find that using the line numbers from git diff or by searching for the "<"-strings. It would be very cool to have a two colored higlight in the minimap that shows the HEAD and CONFLICT area.

That would greatly reduce the number of times I miss a tiny change in a large file by resolving the other conflicts and then committing with typically one line still conflicting.

[alexrussell]

@r0ckarong I imagine that this is best implemented using a minimap plugin. You might find the git-diff plugin is the best place to ask for this feature (or a good plugin to base your own plugin off).

But yes, I agree that this would be quite beneficial!

[abe33]

Hi there, that's an interesting idea but as @alexrussell suggested it should live as a separate plugin. I'm not knowledgeable enough regarding merge conflict to tell you whether it's easy to implement, maybe @smashwilson can give us some insight about its plugin.