From 08ebe7dfcd54870dbfcf6f61ff6df0cf3cf0e0d4 Mon Sep 17 00:00:00 2001
From: Phil Jackson <phil@shellarchive.co.uk>
Date: Thu, 16 Sep 2010 22:33:29 +0100
Subject: [PATCH] Put back the automatic merge function for branch menu.

Closes #57.
---
 magit.el | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/magit.el b/magit.el
index 2ece9b20..92cd9b31 100644
--- a/magit.el
+++ b/magit.el
@@ -2682,6 +2682,13 @@ insert a line to tell how to insert more of them"
         (magit-mode-init topdir 'status #'magit-refresh-status)
         (magit-status-mode t)))))
 
+(magit-define-command automatic-merge (revision)
+  "Merge REVISION into the current 'HEAD'; commit unless merge fails.
+\('git merge REVISION')."
+  (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
+  (if revision
+      (magit-run-git "merge" (magit-rev-to-git revision))))
+
 ;;; Staging and Unstaging
 
 (defun magit-stage-item ()