Try to enable show merged file

[tortoisegit/TortoiseGitJp.git] / src / Git / GitRev.cpp

diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp
index 2692107..f9ddc4f 100644 (file)
--- a/src/Git/GitRev.cpp
+++ b/src/Git/GitRev.cpp
@@ -145,6 +145,10 @@ int GitRev::ParserFromLog(BYTE_VECTOR &log,int start)
                                        else\r
                                                break;\r
                                }\r
+                               if(m_ParentHash.size()>1)\r
+                               {\r
+                                       int a=1;\r
+                               }\r
                                break;\r
                        case LOG_REV_COMMIT_FILE:\r
                                break;\r
@@ -176,6 +180,7 @@ int GitRev::ParserFromLog(BYTE_VECTOR &log,int start)
        \r
        if(filebegin>=0)\r
        {\r
+               \r
                filelist.append(log,filebegin,pos);     \r
                this->m_Files.ParserFromLog(filelist);\r
                this->m_Action=this->m_Files.GetAction();\r
@@ -248,7 +253,7 @@ int GitRev::SafeFetchFullInfo(CGit *git)
                BYTE_VECTOR onelog;\r
                TCHAR oldmark=this->m_Mark;\r
        \r
-               git->GetLog(onelog,m_CommitHash,NULL,1,CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE|CGit::LOG_INFO_DETECT_COPYRENAME);\r
+               git->GetLog(onelog,m_CommitHash,NULL,1,CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE|CGit::LOG_INFO_DETECT_COPYRENAME|CGit::LOG_INFO_SHOW_MERGEDFILE);\r
                CString oldhash=m_CommitHash;\r
                GIT_REV_LIST oldlist=this->m_ParentHash;\r
                ParserFromLog(onelog);\r