Add Redo feature

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 07e13ca..8ac9f36 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -105,6 +105,7 @@ BEGIN
     POPUP "&Edit"
     BEGIN
         MENUITEM "&Undo\tCtrl+Z",               ID_EDIT_UNDO
+        MENUITEM "&Redo\tCtrl+Y",               ID_EDIT_REDO
         MENUITEM SEPARATOR
         MENUITEM "&Next Difference\tTab",       ID_NEXTDIFF
         MENUITEM "&Previous Difference\tShift+Tab", ID_PREVDIFF
@@ -502,7 +503,7 @@ BEGIN
     BUTTON      ID_FILE_SAVE
     SEPARATOR
     BUTTON      ID_EDIT_UNDO
-    SEPARATOR
+    BUTTON      ID_EDIT_REDO
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/res/Toolbar.bmp b/Src/res/Toolbar.bmp
index c9ae825..ee360a2 100644 (file)
Binary files a/Src/res/Toolbar.bmp and b/Src/res/Toolbar.bmp differ

diff --git a/Src/resource.h b/Src/resource.h
index 7dc10ac..1e812d1 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -251,7 +251,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        135
-#define _APS_NEXT_COMMAND_VALUE         32806
+#define _APS_NEXT_COMMAND_VALUE         32807
 #define _APS_NEXT_CONTROL_VALUE         1023
 #define _APS_NEXT_SYMED_VALUE           106
 #endif