Don't show merge base of buffer branch
use fit-window-to-buffer instead of resize-temp-buffer-window

This fixes a problem with emacs 24.3 caused by resize-temp-buffer-window
not operating on windows that were not created by display-buffer