dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-22 04:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature: add context menu for changes in Views.CommitDetail and Views.RevisionCompare to diff with external merge tool (#53)

Browse source
This commit is contained in:
leo 2024-04-07 20:02:43 +08:00
parent b5b1f0cb8d
commit 24b6e39066
5 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ViewModels/DiffContext.cs
View file

@ -147,7 +147,7 @@ namespace SourceGit.ViewModels
});
}
public async void OpenExternalMergeTool()
public void OpenExternalMergeTool()
{
var type = Preference.Instance.ExternalMergeToolType;
var exec = Preference.Instance.ExternalMergeToolPath;
@ -160,7 +160,7 @@ namespace SourceGit.ViewModels
}
var args = tool.Type != 0 ? tool.DiffCmd : Preference.Instance.ExternalMergeToolDiffCmd;
await Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, exec, args, _option));
Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, exec, args, _option));
}
private static readonly HashSet<string> IMG_EXTS = new HashSet<string>()