Index: .gitattributes =================================================================== diff -u -r5e0331927c5eec0381c0c254ac07402fbca0ad36 -rcca4b4e6c79c1a15ac3b6a604d2bb6dbccc217e6 --- .gitattributes (.../.gitattributes) (revision 5e0331927c5eec0381c0c254ac07402fbca0ad36) +++ .gitattributes (.../.gitattributes) (revision cca4b4e6c79c1a15ac3b6a604d2bb6dbccc217e6) @@ -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