git-svn: Fix merge detecting with rewrite-root