merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseShell / IconOverlay.cpp

diff --git a/src/TortoiseShell/IconOverlay.cpp b/src/TortoiseShell/IconOverlay.cpp
index bca63c6..c8b5a33 100644 (file)
--- a/src/TortoiseShell/IconOverlay.cpp
+++ b/src/TortoiseShell/IconOverlay.cpp
@@ -323,7 +323,6 @@ STDMETHODIMP CShellExt::IsMemberOf(LPCWSTR pwszPath, DWORD /*dwAttrib*/)
                        }\r
                case git_wc_status_replaced:\r
                case git_wc_status_modified:\r
-               case git_wc_status_merged:\r
                        if (m_State == FileStateModified)\r
                        {\r
                                g_filepath.clear();\r
@@ -331,6 +330,14 @@ STDMETHODIMP CShellExt::IsMemberOf(LPCWSTR pwszPath, DWORD /*dwAttrib*/)
                        }\r
                        else\r
                                return S_FALSE;\r
+               case git_wc_status_merged:\r
+                       if (m_State == FileStateReadOnly)\r
+                       {\r
+                               g_filepath.clear();\r
+                               return S_OK;\r
+                       }\r
+                       else\r
+                               return S_FALSE;\r
                case git_wc_status_added:\r
                        if (g_addedovlloaded)\r
                        {\r