b238516d1f
Added key bindings: `e` `smerge-ediff` to diff column `K` `smerge-kill-current` to merge action column, (used upper case K, because lower case k moves the cursor to the previous line) Renamed "join curr/next hunk" to "Combine curr/next hunks", to match it's command name: `smerge-combine-with-next` and moved it from the "Merge Action" column to the "Other" column. Because the merge action column handles versions while the combine command acts on hunks. Sorted and groupped the backend keys to match the transient state columns. |
||
|---|---|---|
| .. | ||
| git | ||
| github | ||
| perforce | ||
| version-control | ||