You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Avoid redefining conflict marker faces from smerge-mode
Whenever conflicts appear in Emacs buffer, they get handled by
smerge-mode. The mode isn't enabled by default, but it gets turned on
upon conflict markers entering the buffer.
There's no point in redefining what's already handled by Emacs.
0 commit comments