GitTools · JakeGinnivan · Sep 13, 2015 · Sep 12, 2015 · Sep 13, 2015
diff --git a/.gitattributes b/.gitattributes
@@ -7,11 +7,11 @@
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
+*.sln
+*.csproj
+*.vbproj
+*.fsproj
+*.dbproj
 
 # Denote all files that are truly binary and should not be modified.
 *.dll binary

diff --git a/src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs b/src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs
@@ -25,7 +25,7 @@ public void GenerateMessageTest()
         generatedParameterMessages[0].ShouldBe("GitVersion_name=value");
     }
 
-    [Test, Explicit]
+    [Test]
     public void WriteAllVariablesToTheTextWriter()
     {
         // this test method writes to disc, hence marked explicit

diff --git a/src/GitVersionCore.Tests/Fixtures/BaseGitFlowRepositoryFixture.cs b/src/GitVersionCore.Tests/Fixtures/BaseGitFlowRepositoryFixture.cs
diff --git a/src/GitVersionCore.Tests/Fixtures/CommitCountingRepoFixture.cs b/src/GitVersionCore.Tests/Fixtures/CommitCountingRepoFixture.cs
diff --git a/src/GitVersionCore.Tests/Fixtures/EmptyRepositoryFixture.cs b/src/GitVersionCore.Tests/Fixtures/EmptyRepositoryFixture.cs
diff --git a/src/GitVersionCore.Tests/Fixtures/LocalRepositoryFixture.cs b/src/GitVersionCore.Tests/Fixtures/LocalRepositoryFixture.cs
diff --git a/src/GitVersionCore.Tests/Fixtures/RemoteRepositoryFixture.cs b/src/GitVersionCore.Tests/Fixtures/RemoteRepositoryFixture.cs
diff --git a/src/GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs b/src/GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs