New Editor Git Status Badges: Please add Merge Conflicts

[dhempy]

The new (v3.2 Build 3200) status badges for git file status in the sidebar are great! Thanks for this!

How about including a distinctive badge indicator for merge conflicts?

[wbond]

You can see what the conflicted/unmerged badge looks like at https://www.sublimetext.com/docs/3/git_integration.html#side_bar.

[dhempy]

There is no badge for merge conflicts on that page:

[wbond]

Unmerged == merge conflict

[dhempy]

Ah!!! Thanks for that clarification, @wbond++ !