el/dot-emacs.el: Add a switch for the `--rebase-merges' option.
[profile] / css /
drwxr-xr-x   ..
-rw-r--r-- 551 scottaaronson.com
-rw-r--r-- 402 slatestarcodex.com