Merge branch 'master' of git://git.distorted.org.uk/~mdw/profile
[profile] / .gitattributes
1 *.el diff=lisp
2 dot/emacs diff=lisp