diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index afaf5868..3033da07 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -445,6 +445,10 @@ namespace SourceGit.ViewModels
                 _repo.SetWatcherEnabled(false);
                 Task.Run(() =>
                 {
+                    var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
+                    if (File.Exists(mergeMsgFile))
+                        File.WriteAllText(mergeMsgFile, _commitMessage);
+
                     var succ = _inProgressContext.Continue();
                     Dispatcher.UIThread.Invoke(() =>
                     {