el/dot-emacs.el: Add a switch for the `--rebase-merges' option.
[profile] / kermit /
drwxr-xr-x   ..
-rw-r--r-- 75 dial.shared
-rw-r--r-- 58 net.shared