Update NextVersionCalculatorTests.cs

FISHMANPET · FISHMANPET · commit 7d1a79617476 · 2020-07-13T15:12:48.000-05:00
no FF, like GitHub
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);
         }

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public void MergeIntoMainline()`
`172`	`172`	`fixture.BranchTo("foo");`
`173`	`173`	`fixture.MakeACommit();`
`174`	`174`	`fixture.Checkout("master");`
`175`		`- fixture.Merge("foo");`
	`175`	`+ fixture.MergeNoFF("foo");`
`176`	`176`
`177`	`177`	`fixture.AssertFullSemver("1.0.0", config);`
`178`	`178`	`}`