Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information