From 730cf2a842fbc3cf7eda27d3b946585a2a708e03 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 18 Nov 2020 14:49:08 +0800
Subject: [PATCH] feature<WorkingCopy>: enable mergetool.writeToTemp when open
 external merge tool

---
 src/UI/WorkingCopy.xaml.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/UI/WorkingCopy.xaml.cs b/src/UI/WorkingCopy.xaml.cs
index 5a4cb305..74a9e8f1 100644
--- a/src/UI/WorkingCopy.xaml.cs
+++ b/src/UI/WorkingCopy.xaml.cs
@@ -883,11 +883,13 @@ namespace SourceGit.UI {
                 if (node == null || !node.IsFile) return;
 
                 file = node.FilePath;
-            }            
+            }
 
-            await Task.Run(() => {
-                Repo.RunCommand($"-c mergetool.sourcegit.cmd=\"\\\"{mergeExe}\\\" {mergeParam}\" -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit {file}", null);
-            });
+            var cmd = $"-c mergetool.sourcegit.cmd=\"\\\"{mergeExe}\\\" {mergeParam}\" ";
+            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) {