el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / bg / lilith.jpg
CommitLineData
9f56284f
MW
1