syl20bnr / spacemacs

A community-driven Emacs distribution - The best editor is neither Emacs nor Vim, it's Emacs *and* Vim!
http://spacemacs.org
GNU General Public License v3.0
23.71k stars 4.9k forks source link

[version-control] Add s key binding to smerge-ts for smerge-swap #16628

Closed bcc32 closed 3 weeks ago

bcc32 commented 3 weeks ago

I use this command a decent amount to fix the ordering of the upper/lower regions just before invoking smerge-keep-all. It would be nice to stay in the transient while doing so.