Index: .gitattributes =================================================================== diff -u -r32800e63621c27b579f094beb84587577db91bd7 -r9c1c7f08ab198e62c8c88715cb1091ee21091a52 --- .gitattributes (.../.gitattributes) (revision 32800e63621c27b579f094beb84587577db91bd7) +++ .gitattributes (.../.gitattributes) (revision 9c1c7f08ab198e62c8c88715cb1091ee21091a52) @@ -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