bug#46538: Patch: wrap around smerge-vc-next-conflict if current file still has conflicts

[Konstantin Kharlamov]

Currently, if the buffer has conflict markers above the (point) and it's the 
last conflicted file, we bail out. A user pointed out¹ that it is a good idea 
to try to find conflicts in the current file as well. Indeed, it seems like 
more correct behaviour: going to the next conflict is whole purpose of the 
function, and current file might still have them.

Attached patch implements additional check for conflicts just for the case when 
the buffer is the last conflicted file and all conflicts are above current 
point.

1: 
https://emacs.stackexchange.com/questions/63413/finding-git-conflict-in-the-same-buffer-if-cursor-is-at-end-of-the-buffer

0001-vc-make-smerge-vc-next-conflict-wrap-around.patch
Description: Text Data