OSDN Git Service

Add conflict handle
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / GitLogListAction.cpp
index 5f5f6fa..230ad54 100644 (file)
@@ -175,7 +175,9 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
                        g_Git.GetMapHashToFriendName(m_HashMap);\r
                        Invalidate();\r
                        break;\r
+               case ID_RESET:\r
 \r
+                       break;\r
                default:\r
                        //CMessageBox::Show(NULL,_T("Have not implemented"),_T("TortoiseGit"),MB_OK);\r
                        break;\r