summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/menu-bar.el3
1 files changed, 2 insertions, 1 deletions
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]
'("--"))