Index: .gitattributes =================================================================== diff -u -r618d047e7bfa9ed041bff53146594fc15fa5f827 -ra41d9ce7cd06897fc927fec9d957928861ede3ab --- .gitattributes (.../.gitattributes) (revision 618d047e7bfa9ed041bff53146594fc15fa5f827) +++ .gitattributes (.../.gitattributes) (revision a41d9ce7cd06897fc927fec9d957928861ede3ab) @@ -1,3 +1,6 @@ *.rxtst merge=rx-tree-merge *.rxrep merge=rx-tree-merge -*.rximg merge=rx-img-merge \ No newline at end of file +*.rximg merge=rx-img-merge +*.csproj merge=rx-tree-merge +*.cs merge=rx-tree-merge +*.vb merge=rx-tree-merge