From 240061b43c9362cfd9bc4efdbbeb1cfd11b1415a Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 12 Jun 2016 23:50:45 -0400
Subject: Remove unnecessary magit-merge-editmsg advice

Not needed since Magit's afe10a6 (magit-merge-editmsg: always use
--no-ff, 2016-04-16).
---
 init.el | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index c44476b..1f74d94 100644
--- a/init.el
+++ b/init.el
@@ -932,11 +932,7 @@
               (lambda (fn &rest args)
                 (let ((magit-process-popup-time 0))
                   (apply fn args)))
-              '((name . "magit-fetch-process")))
-  (advice-add
-   'magit-merge-editmsg :around
-   (lambda (f rev &rest _) (funcall f rev "--no-ff"))
-   '((name . "no-ff"))))
+              '((name . "magit-fetch-process"))))
 
 (use-package magit-wip
   :defer t
-- 
cgit v1.2.3