git-svn: Fix discarding of extra parents from svn:mergeinfo