Index: System tests/AutomatedSystemTests/.gitattributes
===================================================================
diff -u
--- System tests/AutomatedSystemTests/.gitattributes	(revision 0)
+++ System tests/AutomatedSystemTests/.gitattributes	(revision 39e753a86f5b8bb7d1487de203fb06ae217915e4)
@@ -0,0 +1,6 @@
+*.rxtst merge=rx-tree-merge
+*.rxrep merge=rx-tree-merge
+*.rximg merge=rx-img-merge
+*.csproj merge=rx-tree-merge
+*.cs merge=rx-tree-merge
+*.vb merge=rx-tree-merge