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

refactor: external diff merge tool - supports to use difftool/mergetool settings from git config directly (#181)

Browse source
This commit is contained in:
leo 2024-06-18 12:10:38 +08:00
parent 06245320a9
commit c56d0cf85e
No known key found for this signature in database
GPG key ID: B528468E49CD0E58
15 changed files with 89 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Views/Preference.axaml.cs
View file

@ -287,6 +287,7 @@ namespace SourceGit.Views
{
ViewModels.Preference.Instance.ExternalMergeToolType = 0;
type = 0;
return;
}
var tool = Models.ExternalMerger.Supported[type];