mirror of
https://fastgit.cc/github.com/sourcegit-scm/sourcegit
synced 2026-04-21 13:20:30 +08:00
@@ -198,7 +198,6 @@ namespace SourceGit.Native
|
||||
if (ExternalMergerType != 0 && (string.IsNullOrEmpty(ExternalMergerExecFile) || !File.Exists(ExternalMergerExecFile)))
|
||||
return null;
|
||||
|
||||
var tool = Models.ExternalMerger.Supported[ExternalMergerType];
|
||||
return new Models.DiffMergeTool(ExternalMergerExecFile, onlyDiff ? ExternalDiffArgs : ExternalMergeArgs);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user