akinsho / git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim
1k stars 35 forks source link

Theming highlights no longer possible #52

Closed uloco closed 1 year ago

uloco commented 1 year ago

When I change the highlight groups from the following groups, they do not have any effect. This used to work with v1.0.0

GitConflictCurrent 
GitConflictIncoming
GitConflictAncestor
GitConflictCurrentLabel
GitConflictIncomingLabel
GitConflictAncestorLabel

See: uloco/bluloco.nvim#51

uloco commented 1 year ago

With git bisect I could find the commit that caused this issue. It was introduced with cbefa7075b67903ca27f6eefdc9c1bf0c4881017

akinsho commented 1 year ago

Should be fixed now (gonna close, this let me know if it's not though)

uloco commented 1 year ago

 @akinsho works! 👍🏼 thanks so much