Show Conflict Status at Filelist at delete conflict local: delete, remote:modified

[tortoisegit/TortoiseGitJp.git] / src / Git / TGitPath.cpp

diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp
index 93787c0..7c7e43c 100644 (file)
--- a/src/Git/TGitPath.cpp
+++ b/src/Git/TGitPath.cpp
@@ -1879,12 +1879,12 @@ CTGitPath * CTGitPathList::LookForGitPath(CString path)
 }\r
 CString CTGitPath::GetActionName(int action)\r
 {\r
+       if(action  & CTGitPath::LOGACTIONS_UNMERGED)\r
+               return _T("Conflict");\r
        if(action  & CTGitPath::LOGACTIONS_ADDED)\r
                return _T("Added");\r
        if(action  & CTGitPath::LOGACTIONS_DELETED)\r
                return _T("Deleted");\r
-       if(action  & CTGitPath::LOGACTIONS_UNMERGED)\r
-               return _T("Conflict");\r
        if(action  & CTGitPath::LOGACTIONS_MODIFIED)\r
                return _T("Modified");\r
        if(action  & CTGitPath::LOGACTIONS_REPLACED)\r