add emacs diff for git
Merge branch 'master' of https://github.com/xuebo/xset