From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 16 Mar 1995 23:04:55 +0000 (+0000)
Subject: (menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff
X-Git-Tag: emacs-19.34~4814
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5438ecd32e4af020875e7068351f5225b72142d9;p=emacs.git

(menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff
package.
---

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]
   '("--"))