Introduce Repository.Index.Conflicts.Names

1 files changed, 7 insertions, 0 deletions

diff --git a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
index 5dfa5b12..b01d04c4 100644
--- a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
+++ b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
@@ -30,6 +30,7 @@ namespace LibGit2Sharp.Tests.TestHelpers
         public static string ShallowTestRepoPath { get; private set; }
         public static string MergedTestRepoWorkingDirPath { get; private set; }
         public static string MergeTestRepoWorkingDirPath { get; private set; }
+        public static string MergeRenamesTestRepoWorkingDirPath { get; private set; }
         public static string RevertTestRepoWorkingDirPath { get; private set; }
         public static string SubmoduleTestRepoWorkingDirPath { get; private set; }
         public static DirectoryInfo ResourcesDirectory { get; private set; }
@@ -63,6 +64,7 @@ namespace LibGit2Sharp.Tests.TestHelpers
             StandardTestRepoPath = Path.Combine(StandardTestRepoWorkingDirPath, ".git");
             ShallowTestRepoPath = Path.Combine(ResourcesDirectory.FullName, "shallow.git");
             MergedTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "mergedrepo_wd");
+            MergeRenamesTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "mergerenames_wd");
             MergeTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "merge_testrepo_wd");
             RevertTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "revert_testrepo_wd");
             SubmoduleTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "submodule_wd");
@@ -126,6 +128,11 @@ namespace LibGit2Sharp.Tests.TestHelpers
             return Clone(MergedTestRepoWorkingDirPath);
         }
 
+        protected string CloneMergeRenamesTestRepo()
+        {
+            return Clone(MergeRenamesTestRepoWorkingDirPath);
+        }
+
         protected string CloneMergeTestRepo()
         {
             return Clone(MergeTestRepoWorkingDirPath);