Prevent svn2git from recording a merge commit for r306097

This would pull in all history of stable into master, and we usually merge the
other way.

Reported by: emaste