el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / .gitignore
1 /local.mk