OSDN Git Service

Rebase: Skip in context-menu appeared twice. First one should be pick.
authorJohan 't Hart <johanthart@gmail.com>
Mon, 8 Jun 2009 21:56:11 +0000 (23:56 +0200)
committerJohan 't Hart <johanthart@gmail.com>
Mon, 8 Jun 2009 21:56:11 +0000 (23:56 +0200)
src/TortoiseProc/GitLogListBase.cpp

index 9dae894..51ba5d7 100644 (file)
@@ -1181,7 +1181,7 @@ void CGitLogListBase::OnContextMenu(CWnd* pWnd, CPoint point)
        {\r
 \r
                if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_PICK))\r
-                       popup.AppendMenuIcon(ID_REBASE_PICK,  IDS_REBASE_SKIP,   IDI_PICK);\r
+                       popup.AppendMenuIcon(ID_REBASE_PICK,  IDS_REBASE_PICK,   IDI_PICK);\r
 \r
                if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_SQUASH))\r
                        popup.AppendMenuIcon(ID_REBASE_SQUASH,IDS_REBASE_SQUASH, IDI_SQUASH);\r