Add Revert to Version feature.

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

diff --git a/src/Git/GitStatus.h b/src/Git/GitStatus.h
index aa21fa3..751e980 100644 (file)
--- a/src/Git/GitStatus.h
+++ b/src/Git/GitStatus.h
@@ -111,7 +111,7 @@ enum WGFILEFLAGS
 \r
 struct wgFile_s\r
 {\r
-       const char *sFileName;                  // filename or directory relative to project root (using forward slashes)\r
+       LPCTSTR sFileName;                              // filename or directory relative to project root (using forward slashes)\r
        int nStatus;                                    // the WGFILESTATUS of the file\r
        int nFlags;                                             // a combination of WGFILEFLAGS\r
 \r
@@ -133,7 +133,7 @@ inline static git_wc_status_kind GitStatusFromWingit(int nStatus)
        {\r
        case WGFS_Normal: return git_wc_status_normal;\r
        case WGFS_Modified: return git_wc_status_modified;\r
-       case WGFS_Staged: return git_wc_status_modified;\r
+       case WGFS_Staged: return git_wc_status_merged;\r
        case WGFS_Added: return git_wc_status_added;\r
        case WGFS_Conflicted: return git_wc_status_conflicted;\r
        case WGFS_Deleted: return git_wc_status_deleted;\r