From ad692a5fb0a8885da84878c8a50409cc22eac991 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Thu, 6 Aug 2015 01:34:11 -0400
Subject: hydra-smerge: Add quit key

---
 lisp/init-git.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lisp')

diff --git a/lisp/init-git.el b/lisp/init-git.el
index 309fcd5..747f7df 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -567,6 +567,7 @@ _a_ keep all
             (?> #'smerge-diff-base-other)
             (?= #'smerge-diff-mine-other))))
     ("l" recenter-top-bottom "recenter")
-    ("u" undo "undo")))
+    ("u" undo "undo")
+    ("q" nil "quit")))
 
 (provide 'init-git)
-- 
cgit v1.2.3