Support externally generated files in .gitignore (take #2)

We do this by including .gitignore-base in our generated .gitignore,
if the former exists.

There was a bug in take #1.