submodules use git:// instead of https://
no undotree
Merge branch 'master' of github.com:jixiuf/emacs_conf

Conflicts:
	site-lisp/submodules/modules