el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / bin / hacks /
2017-08-13 Mark WoodingUse a proper makefile rather than the `setup' script.