Commit 5bb1da1
committed
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.1 parent d187b3d commit 5bb1da1
1 file changed
+0
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
205 | 205 | | |
206 | 206 | | |
207 | 207 | | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | 208 | | |
212 | 209 | | |
213 | 210 | | |
| |||
0 commit comments