diff --git a/magit.el b/magit.el index 10d55cd8..51fcd080 100644 --- a/magit.el +++ b/magit.el @@ -4206,8 +4206,6 @@ Return values: (define-key map (kbd "RET") 'magit-branches-window-checkout) (define-key map (kbd "b") 'magit-branches-window-checkout) (define-key map (kbd "k") 'magit-remove-branch) - (define-key map (kbd "m") 'magit-branches-window-manual-merge) - (define-key map (kbd "M") 'magit-branches-window-automatic-merge) (define-key map (kbd "$") 'magit-display-process) (define-key map (kbd "q") 'magit-quit-branches-window) (define-key map (kbd "g") 'magit-show-branches) @@ -4261,18 +4259,6 @@ With prefix force the removal even it it hasn't been merged." (apply 'magit-run-git (remq nil args)) (magit-show-branches)))) -(defun magit-branches-window-manual-merge () - "Merge the branch at point manually." - (interactive) - (magit-manual-merge (magit--branch-name-at-point)) - (magit-show-branches)) - -(defun magit-branches-window-automatic-merge () - "Merge the branch at point automatically." - (interactive) - (magit-automatic-merge (magit--branch-name-at-point)) - (magit-show-branches)) - (defvar magit-branches-buffer-name "*magit-branches*") (defun magit--is-branch-at-point-remote()