Add Resolve to explore context menu

[tortoisegit/TortoiseGitJp.git] / src / TortoiseShell / Globals.h

diff --git a/src/TortoiseShell/Globals.h b/src/TortoiseShell/Globals.h
index 834c4fe..409ec32 100644 (file)
--- a/src/TortoiseShell/Globals.h
+++ b/src/TortoiseShell/Globals.h
@@ -24,7 +24,7 @@
 #define MENUADD                                0x0000000000000008\r
 #define MENUREVERT                     0x0000000000000010\r
 #define MENUCLEANUP                    0x0000000000000020\r
-//#define MENURESOLVE          0x0000000000000040\r
+#define MENURESOLVE                0x0000000000000040\r
 #define MENUSWITCH                     0x0000000000000080\r
 //#define MENUIMPORT           0x0000000000000100\r
 #define MENUEXPORT                     0x0000000000000200\r
@@ -61,6 +61,7 @@
 #define MENUIMPORTPATCH                0x0000010000000000\r
 #define MENUCHERRYPICK         0x0000020000000000\r
 #define MENUFETCH                      0x0000040000000000\r
+#define MENUREBASE                     0x0000080000000000\r
 \r
 \r
 #define MENUSETTINGS           0x2000000000000000\r