This repository has been archived on 2024-10-22. You can view files and clone it, but cannot push or open issues or pull requests.

duianto b238516d1f [version-control] smerge add 2 keys, etc. ... 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.		2019-04-20 20:50:45 +02:00
..
git	Remove magit-log-arguments variable assignment	2019-04-18 10:14:14 +02:00
github	github: add function to get repo for a forge notification error	2019-03-31 12:16:43 -04:00
perforce	documentation formatting: Wed Dec 5 03:03:03 UTC 2018	2018-12-04 22:06:14 -05:00
version-control	[version-control] smerge add 2 keys, etc.	2019-04-20 20:50:45 +02:00