Adds another Premerge option, which is given a MergeSituation
and Context, and thus may report conflicts.
Adding .gitattributes and .gitignore files

This is in preparation for the migration to git.