//Microsoft Developer Studio generated resource script.
//
-// $Id$
-
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
MENUITEM SEPARATOR
MENUITEM "Copy all diffs to other side...",
ID_POPUP_COPYALLDIFFSTOOTHERSIDE
+
MENUITEM "Copy all diffs from other side...",
ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+
MENUITEM SEPARATOR
MENUITEM "Undo", ID_UNDO
MENUITEM SEPARATOR
BEGIN
MENUITEM "with registered application", ID_DIR_OPEN_LEFT
MENUITEM "with external editor", ID_DIR_OPEN_LEFT_WITHEDITOR
+
MENUITEM "with...", ID_DIR_OPEN_LEFT_WITH
END
POPUP "Open right"
BEGIN
MENUITEM "with registered application", ID_DIR_OPEN_RIGHT
MENUITEM "with external editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
+
MENUITEM "with...", ID_DIR_OPEN_RIGHT_WITH
END
END
BUTTON ID_EDIT_UNDO
BUTTON ID_EDIT_REDO
SEPARATOR
+ BUTTON ID_SHOWLINEDIFF
+ SEPARATOR
BUTTON ID_NEXTDIFF
BUTTON ID_PREVDIFF
BUTTON ID_LASTDIFF
+2003-11-14 Laoran
+ PATCH: [ 841062 ] Alternative icons for PATCH [ 840273 ] (for hilight line diff)
+ Submitted by Tim Gerundt
+ WinMerge: Merge.rc
+ res: Toolbar.bmp
+
2003-11-14 Kimmo
PATCH: [ 841767 ] Store unique item path
Fixes bug: #840547 Copying unique file does not update date and size