# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 795395095 0
# Node ID 796be3f4f8a166daf884ef0ebea5801ef41af425
# Parent  4c0a9853867096de51ebbe63d5c293a13652e216
(menu-bar-file-menu): Changed "Emerge" to "Merge" to agree with the new ediff
package.

diff -r 4c0a98538670 -r 796be3f4f8a1 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Thu Mar 16 22:36:26 1995 +0000
+++ b/lisp/menu-bar.el	Thu Mar 16 23:04:55 1995 +0000
@@ -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]
   '("--"))