Update NextVersionCalculatorTests.cs

no FF, like GitHub
GitTools · Jul 13, 2020 · 7d1a796 · 7d1a796
1 parent 8f0571e
commit 7d1a796
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -172,7 +172,7 @@ public void MergeIntoMainline()
             fixture.BranchTo("foo");
             fixture.MakeACommit();
             fixture.Checkout("master");
-            fixture.Merge("foo");
+            fixture.MergeNoFF("foo");
 
             fixture.AssertFullSemver("1.0.0", config);
         }