Enable the ORT strategy in the control repo

microsoft · Aug 17, 2021 · 30ba580 · 30ba580
1 parent 6a73986
commit 30ba580
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
@@ -66,6 +66,9 @@ public void Initialize()
             GitProcess.Invoke(this.RootPath, "branch --set-upstream " + this.Commitish + " origin/" + this.Commitish);
             GitProcess.Invoke(this.RootPath, "checkout " + this.Commitish);
             GitProcess.Invoke(this.RootPath, "branch --unset-upstream");
+
+            // Enable the ORT merge strategy
+            GitProcess.Invoke(this.RootPath, "config pull.twohead ort");
         }
 
         public void Fetch(string commitish)