Test -> CanResolveConflictsByRemovingFromTheIndex

Edward Thomson · nulltoken · commit 5151c4311d6c · 2014-06-14T19:16:05.000+02:00
We're not clearing the conflicts, we're resolving them.  The
difference is that removing from the index means that the items
get moved to the REUC.  "Clearing" or "removing" (in libgit2
terminology, anyway) means that they are removed without being
resolved (or going into the REUC).
diff --git a/LibGit2Sharp.Tests/ConflictFixture.cs b/LibGit2Sharp.Tests/ConflictFixture.cs
@@ -49,7 +49,7 @@ public static IEnumerable<object[]> ConflictData
          * [InlineData(true, "ancestor-only.txt", false, false, FileStatus.Nonexistent, 0)]
          * [InlineData(false, "ancestor-only.txt", false, false, FileStatus.Nonexistent, 0)]
          */
-        public void CanClearConflictsByRemovingFromTheIndex(
+        public void CanResolveConflictsByRemovingFromTheIndex(
             bool removeFromWorkdir, string filename, bool existsBeforeRemove, bool existsAfterRemove, FileStatus lastStatus, int removedIndexEntries)
         {
             var path = CloneMergedTestRepo();

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static IEnumerable<object[]> ConflictData`
`49`	`49`	`* [InlineData(true, "ancestor-only.txt", false, false, FileStatus.Nonexistent, 0)]`
`50`	`50`	`* [InlineData(false, "ancestor-only.txt", false, false, FileStatus.Nonexistent, 0)]`
`51`	`51`	`*/`
`52`		`- public void CanClearConflictsByRemovingFromTheIndex( 50A1`
	`52`	`+ public void CanResolveConflictsByRemovingFromTheIndex(`
`53`	`53`	`bool removeFromWorkdir, string filename, bool existsBeforeRemove, bool existsAfterRemove, FileStatus lastStatus, int removedIndexEntries)`
`54`	`54`	`{`
`55`	`55`	`var path = CloneMergedTestRepo();`