diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-06-01 21:17:56 +0400 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2014-06-14 21:16:05 +0400 |
| commit | 5151c4311d6c12d242424b24ff3988f2a5398035 (patch) | |
| tree | 3e6abfba826622128697ad2aed3e2507de08821d /LibGit2Sharp.Tests | |
| parent | af6ae4ecd7bc66e77c1d4957a37eee272ba19bca (diff) | |
Test -> CanResolveConflictsByRemovingFromTheIndex
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).
Diffstat (limited to 'LibGit2Sharp.Tests')
| -rw-r--r-- | LibGit2Sharp.Tests/ConflictFixture.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LibGit2Sharp.Tests/ConflictFixture.cs b/LibGit2Sharp.Tests/ConflictFixture.cs index deec945c..596c1062 100644 --- a/LibGit2Sharp.Tests/ConflictFixture.cs +++ b/LibGit2Sharp.Tests/ConflictFixture.cs @@ -49,7 +49,7 @@ namespace LibGit2Sharp.Tests * [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(); |