diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2015-08-06 01:34:11 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2015-08-06 01:34:11 -0400 |
| commit | ad692a5fb0a8885da84878c8a50409cc22eac991 (patch) | |
| tree | 8d256a24eb9d02917ab03bfe09a877b33649e6ef /lisp | |
| parent | 3bdbf8a030338fcb6d689a516af26f0302ca8133 (diff) | |
| download | emacs.d-ad692a5fb0a8885da84878c8a50409cc22eac991.tar.gz | |
hydra-smerge: Add quit key
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/init-git.el | 3 |
1 files changed, 2 insertions, 1 deletions
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) |