el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / .gitattributes
CommitLineData
d3595fdf
MW
1*.el diff=lisp
2dot/emacs diff=lisp