git-gui: Replace merge dialog with our revision picker widget