From 562f21df6fc49539fdcf93d4b9d370f8299365f5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 13 Nov 2025 18:10:17 +0800
Subject: [PATCH] enhance: always try to load commit message from
 `$GIT_DIR/MERGE_MSG` (#1915)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/WorkingCopy.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 5b54a8dd..b57e9248 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -776,7 +776,10 @@ namespace SourceGit.ViewModels
                 InProgressContext = null;
 
             if (_inProgressContext == null)
+            {
+                LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "MERGE_MSG"));
                 return;
+            }
 
             if (_inProgressContext.GetType() == oldType && !string.IsNullOrEmpty(_commitMessage))
                 return;