el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / git /
drwxr-xr-x   ..
-rw-r--r-- 196 attributes
-rw-r--r-- 299 gitignore