Subject: bug#46538: [PATCH] vc: make smerge-vc-next-conflict wrap around

From: Lars Ingebrigtsen <[email-masked]>
Date: Tue, 16 Feb 2021 12:50:18 +0100

Konstantin Kharlamov <[email-masked]> writes:

> * 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.

Looks good to me, so I've applied your patch to Emacs 28.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no