git svn: handle SVN merges from revisions past the tip of the branch