Importing non-version controlled bits and pieces to Git

Hi!

I am looking at moving a project that has not been version-controlled in the regular sense into Git. I have found it to currently consist of 40 directories with copies of the set of files in various shapes.

I have reconstructed something that looks like a probable revision tree for these 40 directories, and I want to put this into Git so that I can examine what changes have been made where, and merge the various versions back together so that there can be one version with all the various fixes.

I was looking for something that could do this for me, but found nothing mentioned on the Wiki, and my Google karma was not good enough to find something, either. The closest thing I know of is the import-tars.perl script that I have used before, when importing something with a (near-)linear history, but this is too far off from a linear history to try to tar up the directories and import that way, I believe.

Has anyone written such an import tool, or should I start hacking?