ediff + org-mode.
Merge branch 'master' of github.com:yasuhito/prelude