test for branch modify to diff
Merge branch 'master' of github.com:mh29110/emacs into config_branch