TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vc: use smerge-vc-next-conflict instead of smerge-next

This commit is contained in:
Michael Peyton Jones 2021-06-19 21:42:44 +01:00 committed by Maxi Wolff
parent 8e5b4c7ec3
commit f928c32eec
No known key found for this signature in database
GPG Key ID: 2DD07025BFDBD89A
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layers/+source-control/version-control/README.org
View File

@ -211,12 +211,12 @@ Use ~SPC g .~ to enter a transient state for quickly navigating between hunks in
** Smerge Mode Transient-state
Movement:
| Key binding | Description |
|----------------------------+---------------------|
| ~SPC g r n~ | Next hunk |
| ~SPC g r N~ or ~SPC g r p~ | Previous hunk |
| ~SPC g r j~ | Go to next line |
| ~SPC g r k~ | Go to previous line |
| Key binding | Description |
|----------------------------+------------------------------------------|
| ~SPC g r n~ | Next conflict (possibly in another file) |
| ~SPC g r N~ or ~SPC g r p~ | Previous conflict |
| ~SPC g r j~ | Go to next line |
| ~SPC g r k~ | Go to previous line |
Merge Actions:

18
layers/+source-control/version-control/packages.el
View File

@ -279,21 +279,21 @@
(spacemacs|transient-state-format-hint smerge
spacemacs--smerge-ts-full-hint
"\n
Movement^^^^ Merge Action^^ Diff^^ Other
---------------^^^^ ----------------^^ --------------^^ ---------------------------^^
[_n_]^^ next hunk [_b_] keep base [_<_] base/mine [_C_] combine curr/next hunks
[_N_/_p_] prev hunk [_m_] keep mine [_=_] mine/other [_u_] undo
[_j_]^^ next line [_a_] keep all [_>_] base/other [_q_] quit
[_k_]^^ prev line [_o_] keep other [_r_] refine
^^^^ [_c_] keep current [_e_] ediff [_?_]^^ toggle help
^^^^ [_K_] kill current")
Movement^^^^ Merge Action^^ Diff^^ Other
-------------------^^^^ ----------------^^ --------------^^ ---------------------------^^
[_n_]^^ next conflict [_b_] keep base [_<_] base/mine [_C_] combine curr/next hunks
[_N_/_p_] prev conflict [_m_] keep mine [_=_] mine/other [_u_] undo
[_j_]^^ next line [_a_] keep all [_>_] base/other [_q_] quit
[_k_]^^ prev line [_o_] keep other [_r_] refine
^^^^ [_c_] keep current [_e_] ediff [_?_]^^ toggle help
^^^^ [_K_] kill current")
(spacemacs|define-transient-state smerge
:title "Smerge Transient State"
:hint-is-doc t
:dynamic-hint (spacemacs//smerge-ts-hint)
:bindings
;; move
("n" smerge-next)
("n" smerge-vc-next-conflict)
("N" smerge-prev)
("p" smerge-prev)
("j" evil-next-line)