From 256ab0b2d857bd04dfd3d4574ab3390a4f4439d3 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 17 Nov 2018 13:18:32 -0500
Subject: Update advice for magit-merge rename

---
 init.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 02bfd36..177275a 100644
--- a/init.el
+++ b/init.el
@@ -1057,7 +1057,7 @@
                   (apply fn args)))
               '((name . "magit-fetch-process")))
 
-  (advice-add 'magit-merge
+  (advice-add 'magit-merge-plain
               :around
               (lambda (fn rev &optional args &rest other)
                 (let ((msg (km/magit-merge-pull-message rev)))
-- 
cgit v1.2.3