From 5438ecd32e4af020875e7068351f5225b72142d9 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Thu, 16 Mar 1995 23:04:55 +0000 Subject: [PATCH] (menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff package. --- lisp/menu-bar.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 872a38bdc39..0e350d93b17 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -46,9 +46,10 @@ (define-key menu-bar-file-menu [epatch] '("Apply Patch" . menu-bar-epatch-menu)) +(define-key menu-bar-file-menu [ediff-merge] + '("Merge" . menu-bar-ediff-merge-menu)) (define-key menu-bar-file-menu [ediff] '("Compare" . menu-bar-ediff-menu)) -(define-key menu-bar-file-menu [emerge] '("Emerge" . menu-bar-emerge-menu)) (define-key menu-bar-file-menu [separator-misc] '("--")) -- 2.39.5