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 |
||
|---|---|---|
| .. | ||
| bug-reference-backport.el | ||
| hydra.el | ||
| vc.el | ||