git-svnimport: Improved detection of merges.