From ecb163e4d42a524ac70b7de9f0df8ce86c01ae69 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 30 Jul 2017 23:12:00 -0400
Subject: Add magit-imerge

---
 init.el | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/init.el b/init.el
index e7b4341..c7c2ad7 100644
--- a/init.el
+++ b/init.el
@@ -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
-- 
cgit v1.2.3