From 30ba580860e10fadf80afb6266095efc7ec3388c Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Tue, 17 Aug 2021 10:07:07 -0400 Subject: [PATCH] Enable the ORT strategy in the control repo --- GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs index d2f792cea..e8c40099d 100644 --- 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)