el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.
[profile] / bin / git-copyright-dates
2017-08-15 Mark Woodingbin/git-copyright-dates: New script to work out copyrig...