Added extra helper methods to BYTE_VECTOR

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

diff --git a/src/Git/GitStatusListCtrl.h b/src/Git/GitStatusListCtrl.h
index 6226cb3..70938f3 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
@@ -914,6 +914,7 @@ public:
        int UpdateWithGitPathList(CTGitPathList &list);\r
 \r
        void AddEntry(CTGitPath* path, WORD langID, int ListIndex);\r
+       void Clear();\r
        int m_FileLoaded;\r
        git_revnum_t m_CurrentVersion;\r
 public:\r