merge driver for custom and per root persistence
merge driver for custom and per root persistence (continued)
.gitattributes for per-root persistence files
fix patterns in file recogintion to multiline
allow ModelMergeTool for per root persistence
increase buffer size for file type by content recogintion
fix patterns in filetype recognition
Merge remote-tracking branch 'origin/master' into 3.0/mikev/test
Merge branch '3.0/mikev/test'
make