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