Try to enable show merged file

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / LogDlgHelper.h

diff --git a/src/TortoiseProc/LogDlgHelper.h b/src/TortoiseProc/LogDlgHelper.h
index 945f8d4..031c51c 100644 (file)
--- a/src/TortoiseProc/LogDlgHelper.h
+++ b/src/TortoiseProc/LogDlgHelper.h
@@ -58,7 +58,7 @@ public:
                m_FirstFreeLane=0;\r
        }\r
        void ClearAll();\r
-       int  ParserFromLog(CTGitPath *path =NULL,int count = -1,int infomask=CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE,\r
+       int  ParserFromLog(CTGitPath *path =NULL,int count = -1,int infomask=CGit::LOG_INFO_STAT|CGit::LOG_INFO_FILESTATE|CGit::LOG_INFO_SHOW_MERGEDFILE,\r
                                                                                         CString *from=NULL,CString *to=NULL);\r
 \r
        int  FetchShortLog(CTGitPath *path , CString &hash,int count=-1 ,int mask=CGit::LOG_INFO_ONLY_HASH );\r