added 'conflict' status and fixed status detection for context menu

[tortoisegit/TortoiseGitJp.git] / ext / wingit / wingit.h

diff --git a/ext/wingit/wingit.h b/ext/wingit/wingit.h
index 4693207..8794c3f 100644 (file)
--- a/ext/wingit/wingit.h
+++ b/ext/wingit/wingit.h
@@ -13,7 +13,7 @@
 #ifndef _WINGIT_H_\r
 #define _WINGIT_H_\r
 \r
-#define WG_VERSION "0.1.6"\r
+#define WG_VERSION "0.1.7"\r
 \r
 \r
 #define DLLIMPORT __declspec(dllimport) __stdcall\r
@@ -56,6 +56,9 @@ enum WGFILESTATUS
 {\r
        WGFS_Normal,\r
        WGFS_Modified,\r
+       //WGFS_Staged,\r
+       //WGFS_Added,\r
+       WGFS_Conflicted,\r
        WGFS_Deleted,\r
 \r
        WGFS_Unknown = -1,\r
@@ -74,7 +77,6 @@ struct wgFile_s
 {\r
        const char *sFileName;                  // filename or directory relative to project root (using forward slashes)\r
        int nStatus;                                    // the WGFILESTATUS of the file\r
-       int nStage;                                             // the stage number of the file (0 if unstaged)\r
        int nFlags;                                             // a combination of WGFILEFLAGS\r
 \r
        const BYTE* sha1;                               // points to the BYTE[20] sha1 (NULL for directories, WGFF_Directory)\r