feat(vc): integrate smerge-mode

Browse source

Activates smerge-mode if the file contains merge conflict markers. Also
turns binds the localleader to `smerge-mode-map` when it's active.

Also removes an unused leader binding (which will never be set because
:ui hydra was removed in b08c2c7).

Amend: b08c2c745f
Close: #5954

...

This commit is contained in:

Henrik Lissner 2024-09-01 16:47:21 -04:00

parent 308444d612

commit 682f151176

No known key found for this signature in database

GPG key ID: B60957CA074D39A3

2 changed files with 14 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files