Index: .gitattributes =================================================================== diff -u -r5dd4c5042be01e4dbac4f692efc3a6a6e2a34f07 -r2c7e114ea962946d137445914087abd134b7cf9c --- .gitattributes (.../.gitattributes) (revision 5dd4c5042be01e4dbac4f692efc3a6a6e2a34f07) +++ .gitattributes (.../.gitattributes) (revision 2c7e114ea962946d137445914087abd134b7cf9c) @@ -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