]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 03adc69) | patch
make smerge-vc-next-conflict wrap around
authorKonstantin Kharlamov <Hi-Angel@yandex.ru>
Tue, 16 Feb 2021 11:49:30 +0000 (12:49 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Tue, 16 Feb 2021 11:49:53 +0000 (12:49 +0100)
commit5b10ca8f4f70cbdc51970b8b756d11f1dbf6e2f6
treec135f19741e7c413e8fc7e13cec4eb47f62c7757tree | snapshot
parent03adc69af708e53d18f4efecbcaaee02f055ef56commit | diff
make smerge-vc-next-conflict wrap around

* lisp/vc/smerge-mode.el:
(smerge-vc-next-conflict): While searching for conflict markers,
wrap search around if current file is the last one with conflicts
(bug#46538).
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.