Add support for merging svn derived git repos

Turns out when merging Git repositories who's beginnings are from
Subversion, you get an error. Turns out, somewhere in the bowels of
Stackoverflow, the answer was to use the second commit in the history,
not the first one.