michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature<WorkingCopy>: enable mergetool.writeToTemp when open external merge tool

Browse source
This commit is contained in:
leo 2020-11-18 14:49:08 +08:00
parent 2685a9b709
commit 730cf2a842
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/UI/WorkingCopy.xaml.cs
View file

@ -885,9 +885,11 @@ namespace SourceGit.UI {
file = node.FilePath; file = node.FilePath;
} }
await Task.Run(() => { var cmd = $"-c mergetool.sourcegit.cmd=\"\\\"{mergeExe}\\\" {mergeParam}\" ";
Repo.RunCommand($"-c mergetool.sourcegit.cmd=\"\\\"{mergeExe}\\\" {mergeParam}\" -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {file}", null); cmd += "-c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true ";
}); cmd += $"mergetool --tool=sourcegit {file}";
await Task.Run(() => Repo.RunCommand(cmd, null));
} }
private async void UseTheirs(object sender, RoutedEventArgs e) { private async void UseTheirs(object sender, RoutedEventArgs e) {