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