merge original branch.

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

diff --git a/src/TortoiseShell/Globals.h b/src/TortoiseShell/Globals.h
index b0828f1..36c01f2 100644 (file)
--- a/src/TortoiseShell/Globals.h
+++ b/src/TortoiseShell/Globals.h
@@ -44,7 +44,7 @@
 #define MENUBLAME                      0x0000000000800000\r
 #define MENUCREATEPATCH                0x0000000001000000\r
 #define MENUAPPLYPATCH         0x0000000002000000\r
-//#define MENUREVISIONGRAPH    0x0000000004000000\r
+#define MENUREMOVEKEEP         0x0000000004000000\r
 #define MENUSVNREBASE          0x0000000008000000\r
 #define MENUSVNDCOMMIT         0x0000000010000000\r
 #define MENUPROPERTIES         0x0000000020000000\r
@@ -68,6 +68,7 @@
 #define MENUSUBADD                     0x0000800000000000\r
 #define MENUSUBSYNC                    0x0001000000000000\r
 #define MENUSTASHPOP           0x0002000000000000\r
+#define MENUDIFFTWO                    0x0004000000000000\r
 \r
 #define MENUSETTINGS           0x2000000000000000\r
 #define MENUHELP                       0x4000000000000000\r