b21a7da680
I often use these operations to ask how mine and other have diverged: =< smerge-diff-base-mine == smerge-diff-mine-other => smerge-diff-base-other It's awkward to use their global keybindings under C-c ^ because that exits the smerge transient-state. Judging from issue GH-7378 there was no principled reason to omit them, only that the author did not use them himself. |
||
|---|---|---|
| .. | ||
| +chat | ||
| +checkers | ||
| +completion | ||
| +distributions | ||
| +emacs | ||
| +filetree | ||
| +fonts/unicode-fonts | ||
| +frameworks | ||
| +fun | ||
| +intl | ||
| +lang | ||
| +misc | ||
| +music/spotify | ||
| +os | ||
| +pair-programming/floobits | ||
| +readers | ||
| +source-control | ||
| +spacemacs | ||
| +tags | ||
| +themes | ||
| +tools | ||
| +vim | ||
| +web-services | ||
| auto-layer.el | ||
| LAYERS.org | ||