Index: .gitattributes =================================================================== diff -u -rdb0a0cb677be39c8b2c63a6f9eb19c72ea93779c -ra870e040be56028957f5de0c5b5a0bc190c67e4e --- .gitattributes (.../.gitattributes) (revision db0a0cb677be39c8b2c63a6f9eb19c72ea93779c) +++ .gitattributes (.../.gitattributes) (revision a870e040be56028957f5de0c5b5a0bc190c67e4e) @@ -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