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

feature<MergeTool>: supports to use WinMerge as git.mergetool

Browse source
This commit is contained in:
leo 2021-05-28 20:49:43 +08:00
parent e5ac504134
commit 11420ee5b4
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Views/Widgets/WorkingCopy.xaml.cs
View file

@ -200,6 +200,7 @@ namespace SourceGit.Views.Widgets {
var cmd = new Commands.Command();
cmd.Cwd = repo.Path;
cmd.DontRaiseError = true;
cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{mergeExe}\\\" {merger.Cmd}\" ";
cmd.Args += "-c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true ";
cmd.Args += $"mergetool --tool=sourcegit {change.Path}";