added .gitattributes to union-merge project file