awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

ui/vc emacs/vc: unify hydra design

Browse Source 
this design will also break less based on the fonts
This commit is contained in:
Benjamin Andresen
2018-06-23 16:25:58 +02:00
parent a53503eadb
commit 61cdac230f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/emacs/vc/config.el
View File

@ -72,15 +72,15 @@
;; no merge conflicts remain.
:post (smerge-auto-leave))
"
╭────────┐
Movement Keep Diff Other │ smerge │
╭─────────────────────────────────────────────────┴────────╯
[smerge]
Movement Keep Diff Other
╭─────────────────────────────────────────────────────────╯
^_g_^ [_b_] base [_<_] upper/base [_C_] Combine
^_C-k_^ [_u_] upper [_=_] upper/lower [_r_] resolve
^_k_ ↑^ [_l_] lower [_>_] base/lower [_R_] remove
^_j_ ↓^ [_a_] all [_H_] hightlight
^_C-j_^ [_RET_] current [_E_] ediff ╭──────────
^_G_^ │ [_q_] quit"
^_C-j_^ [_RET_] current [_E_] ediff ╭──────────
^_G_^ │ [_q_] quit"
("g" (progn (goto-char (point-min)) (smerge-next)))
("G" (progn (goto-char (point-max)) (smerge-prev)))
("C-j" smerge-next)