#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
* 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