Fix TortoiseGitBlame commit is not in log list problem.

[tortoisegit/TortoiseGitJp.git] / src / Git / GitStatusListCtrl.h

diff --git a/src/Git/GitStatusListCtrl.h b/src/Git/GitStatusListCtrl.h
index 21233a9..7fda321 100644 (file)
--- a/src/Git/GitStatusListCtrl.h
+++ b/src/Git/GitStatusListCtrl.h
@@ -58,7 +58,7 @@
 #define SVNSLC_SHOWMODIFIED            CTGitPath::LOGACTIONS_MODIFIED\r
 #define SVNSLC_SHOWADDED               CTGitPath::LOGACTIONS_ADDED\r
 #define SVNSLC_SHOWREMOVED             CTGitPath::LOGACTIONS_DELETED\r
-#define SVNSLC_SHOWCONFLICTED  CTGitPath::LOGACTIONS_CONFLICT\r
+#define SVNSLC_SHOWCONFLICTED  CTGitPath::LOGACTIONS_UNMERGED\r
 #define SVNSLC_SHOWMISSING             0x00000000\r
 #define SVNSLC_SHOWREPLACED            CTGitPath::LOGACTIONS_REPLACED\r
 #define SVNSLC_SHOWMERGED              0x00000000\r
@@ -525,7 +525,7 @@ public:
         * \param dwShow mask of file types to show. Use the GitSLC_SHOWxxx defines.\r
         * \param dwCheck mask of file types to check. Use GitLC_SHOWxxx defines. Default (0) means 'use the entry's stored check status'\r
         */\r
-       void Show(DWORD dwShow, DWORD dwCheck = 0, bool bShowFolders = true);\r
+       void Show(DWORD dwShow, DWORD dwCheck = 0, bool bShowFolders = true,BOOL updateStatusList=FALSE);\r
        void Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders = true);\r
 \r
        /**\r
@@ -638,7 +638,7 @@ public:
         * if \a bStrict is set to false, then the paths passed to the control\r
         * to fetch the status (in GetStatus()) are used if possible.\r
         */\r
-       CTGitPath GetCommonDirectory(bool bStrict);\r
+       CString GetCommonDirectory(bool bStrict);\r
 \r
        /**\r
         * Returns the parent url of all entries in the control.\r