{\r
case WGFS_Normal: return git_wc_status_normal;\r
case WGFS_Modified: return git_wc_status_modified;\r
- case WGFS_Staged: return git_wc_status_modified;\r
+ case WGFS_Staged: return git_wc_status_merged;\r
case WGFS_Added: return git_wc_status_added;\r
case WGFS_Conflicted: return git_wc_status_conflicted;\r
case WGFS_Deleted: return git_wc_status_deleted;\r
}\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
}\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