el/dot-emacs.el: Add a switch for the `--rebase-merges' option.
[profile] / css /
2019-01-23 Mark Woodingcss/*: Add some HTML style hacks I use in a few places.