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

[version-control] Smerge TS formatting

Browse source 
Capitalize title and column headers.

Reduce two to one space between the key and description in the first column.
Rename and separate "move up/down" to "next line" and "prev line", to reduce the
first columns width, and to make it clear that it doesn't move the hunks.

Reduce four to two spaces between the first and second columns.

Rename "combine with next" to "join curr/next hunk" to indicate that the
hunks/conflicts are combined and not just of the versions.

Add a new column: Diff
Remove "diff" and "to" from diff key descriptions, to reduce the column width.
Move refine from the Other column to the new Diff column.
This commit is contained in:
duianto 2019-04-20 11:05:30 +02:00
parent b21a7da680
commit 677c06c759
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -268,16 +268,16 @@
:config
(progn
(spacemacs|define-transient-state smerge
:title "smerge transient state"
:title "Smerge Transient State"
:doc "
movement^^^^ merge action^^ other
---------------------^^^^ -------------------^^ -----------
[_n_]^^ next hunk [_b_] keep base [_u_] undo
[_N_/_p_] prev hunk [_m_] keep mine [_r_] refine
[_j_/_k_] move up/down [_a_] keep all [_q_] quit
^^^^ [_o_] keep other [_=<_] diff base to mine
^^^^ [_c_] keep current [_==_] diff mine to other
^^^^ [_C_] combine with next [_=>_] diff base to other"
Movement^^^^ Merge Action^^ Diff^^ Other
---------------^^^^ -----------------------^^ ---------------^^ --------^^
[_n_]^^ next hunk [_b_] keep base [_=<_] base/mine [_u_] undo
[_N_/_p_] prev hunk [_m_] keep mine [_==_] mine/other [_q_] quit
[_j_]^^ next line [_a_] keep all [_=>_] base/other
[_k_]^^ prev line [_o_] keep other [_r_] refine
^^^^ [_c_] keep current
^^^^ [_C_] join curr/next hunk"
:bindings
("n" smerge-next)
("p" smerge-prev)