summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
Diffstat (limited to 'init.el')
-rw-r--r--init.el2
1 files changed, 1 insertions, 1 deletions
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)))