summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2018-11-17 13:18:32 -0500
committerKyle Meyer <kyle@kyleam.com>2018-12-09 14:58:55 -0500
commit256ab0b2d857bd04dfd3d4574ab3390a4f4439d3 (patch)
tree5114790d4117313a0e08a7962f4272caa14bea74
parent91aa2a6bb65653bd63c866f8e5c7f1887761377e (diff)
downloademacs.d-256ab0b2d857bd04dfd3d4574ab3390a4f4439d3.tar.gz
Update advice for magit-merge rename
-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)))