merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / GitLogListBase.cpp

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index 294f30e..b74a59b 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -180,7 +180,7 @@ END_MESSAGE_MAP()
 \r
 void CGitLogListBase::OnMeasureItem(int nIDCtl, LPMEASUREITEMSTRUCT lpMeasureItemStruct)\r
 {\r
-       // TODO: ÔÚ´ËÌí¼ÓÏûÏ¢´¦Àí³ÌÐò´úÂëºÍ/»òµ÷ÓÃĬÈÏÖµ\r
+       // TODO: ï¾\94ï¾\9aï½´ï¾\8bï¾\8c�ï¾\93ï¾\8fûï¾\8f｢ｴｦï¾\80�ï¾\8cï¾\90òï½´úï¾\82�ï¾\8d/ï½»òï½µ÷ï¾\93ï¾\83ï¾\84ｬï¾\88ï¾\8fï¾\96ï½µ\r
 \r
        CListCtrl::OnMeasureItem(nIDCtl, lpMeasureItemStruct);\r
 }\r
@@ -2074,7 +2074,7 @@ UINT CGitLogListBase::LogThread()
                        pRev->m_Files.Clear();\r
                        pRev->m_ParentHash.clear();\r
                        pRev->m_ParentHash.push_back(m_HeadHash);\r
-                       g_Git.GetCommitDiffList(pRev->m_CommitHash.ToString(),this->m_HeadHash, pRev->m_Files);\r
+                       g_Git.GetCommitDiffList(pRev->m_CommitHash.ToString(),this->m_HeadHash.ToString(), pRev->m_Files);\r
                        pRev->m_Action =0;\r
                \r
                        for(int j=0;j< pRev->m_Files.GetCount();j++)\r
@@ -2648,4 +2648,4 @@ int CGitLogListBase::GetHeadIndex()
                }\r
        }\r
        return -1;\r
-}
\ No newline at end of file
+}\r