dotfiles/emacs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix formatting in init-hyrdra.el

Browse Source
This commit is contained in:
Adam Goldsmith 2019-05-19 19:24:06 -04:00
parent ae3d062153
commit d49d244dff
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.emacs.d/init-hydra.el
View File

@ -86,9 +86,8 @@ word: _w_: 1 char _W_: 0 char"
("W" avy-goto-word-0)
("q" nil))
(defhydra hydra-smerge
(:color pink :hint nil :post (smerge-auto-leave))
"
(defhydra hydra-smerge (:hint nil :color pink :post (smerge-auto-leave))
"
^Move^ ^Keep^ ^Diff^ ^Other^
^^-----------^^-------------------^^---------------------^^-------
_n_ext _b_ase _<_: upper/base _C_ombine
@ -97,20 +96,20 @@ _p_rev _u_pper _=_: upper/lower _r_esolve
^^ _a_ll _R_efine
^^ _RET_: current _E_diff _q_: cancel
"
("n" smerge-next)
("p" smerge-prev)
("b" smerge-keep-base)
("u" smerge-keep-upper)
("l" smerge-keep-lower)
("a" smerge-keep-all)
("RET" smerge-keep-current)
("\C-m" smerge-keep-current)
("<" smerge-diff-base-upper)
("=" smerge-diff-upper-lower)
(">" smerge-diff-base-lower)
("R" smerge-refine)
("E" smerge-ediff)
("C" smerge-combine-with-next)
("r" smerge-resolve)
("k" smerge-kill-current)
("q" nil :color blue))
("n" smerge-next)
("p" smerge-prev)
("b" smerge-keep-base)
("u" smerge-keep-upper)
("l" smerge-keep-lower)
("a" smerge-keep-all)
("RET" smerge-keep-current)
("\C-m" smerge-keep-current)
("<" smerge-diff-base-upper)
("=" smerge-diff-upper-lower)
(">" smerge-diff-base-lower)
("R" smerge-refine)
("E" smerge-ediff)
("C" smerge-combine-with-next)
("r" smerge-resolve)
("k" smerge-kill-current)
("q" nil :color blue))