el/dot-emacs.el: Add a switch for the `--rebase-merges' option.
[profile] / .gitattributes
1 *.el diff=lisp
2 dot/emacs diff=lisp