Git diff with emacs ediff bookmark.