OSDN Git Service

Add conflict handle
[tortoisegit/TortoiseGitJp.git] / src / Git / GitStatusListCtrl.h
index 6226cb3..7fda321 100644 (file)
@@ -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