(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 872a38bdc3946ee2b180ac45133bdec7a7ec861b..0e350d93b17bb541c96755c0412a99e4371f479a 100644 (file)
--- 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]
   '("--"))