new post
use vimdiff
Merge branch 'hexo'
hexo g