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