Index: .gitattributes =================================================================== diff -u -r3cd611007ef588b33a16510b23ee378f98aad298 -r90085676bddf8d7caf19953de652829157f4a038 --- .gitattributes (.../.gitattributes) (revision 3cd611007ef588b33a16510b23ee378f98aad298) +++ .gitattributes (.../.gitattributes) (revision 90085676bddf8d7caf19953de652829157f4a038) @@ -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