diff options
author | Kyle Meyer <kyle@kyleam.com> | 2017-07-30 23:12:00 -0400 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2017-07-30 23:12:00 -0400 |
commit | ecb163e4d42a524ac70b7de9f0df8ce86c01ae69 (patch) | |
tree | 43c986bc155499f85c77cad384b3bde601c81750 | |
parent | 1f2f21c867fac79f6d04b4b8caad2a3c040b3269 (diff) | |
download | emacs.d-ecb163e4d42a524ac70b7de9f0df8ce86c01ae69.tar.gz |
Add magit-imerge
-rw-r--r-- | init.el | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1194,6 +1194,11 @@ :defer t :init (require 'magit-tbdiff-autoloads nil t)) +(use-package magit-imerge + :load-path "~/src/emacs/magit-imerge/" + :defer t + :init (require 'magit-imerge-autoloads nil t)) + (use-package git-commit ;; :load-path "~/src/emacs/magit/lisp/" :defer t |