git-svn: handle merge-base failures