\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
{\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