bab4c921c8
This is provided by `smerge-mode` in Emacs 27, and functions exactly like `smerge-next`, except that if there are no more conflicts in the current file, it will go to the next file with conflicts. Arguably this could be a different key binding. However, I find that it is almost strictly superior to `smerge-next`: I can't think of a case where I *wouldn't* immediately want to go to the next file with conflicts, and even if you do by accident you can just pop back to the preceding buffer. So I think it warrants being the default. Close: #5431 |
||
|---|---|---|
| .. | ||
| autoload | ||
| config.el | ||
| packages.el | ||
| README.org | ||
:emacs vc
Description unfold
This module augments Emacs builtin version control support and provides better
integration with git.
Maintainers
Module flags
This module has no flags.
Packages
Hacks
- Allow doom-package:browse-at-remote commands in doom-package:git-timemachine buffers to open that file in your browser at the visited revision.
- doom-package:git-timemachine buffers will display revision details in the header-line, rather than the minibuffer (easier to see).
- doom-package:browse-at-remote will fall back to the
masterbranch if target is in a detached state.
TODO Changelog
This module does not have a changelog yet.
Installation
Enable this module in your doom! block.
This module only requires Git.
TODO Usage
🔨 This module has no usage documentation yet. Write some?
TODO Configuration
🔨 This module has no configuration documentation yet. Write some?
Troubleshooting
There are no known problems with this module. Report one?
Frequently asked questions
This module has no FAQs yet. Ask one?
TODO Appendix
🔨 This module has no appendix yet. Write one?