--- a/RCSConflictEditTextView.st	Mon Jul 23 09:52:37 2018 +0200
+++ b/RCSConflictEditTextView.st	Mon Jul 23 09:54:09 2018 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1998 by eXept Software AG
               All Rights Reserved
@@ -49,9 +51,18 @@
 moveToNextChanged
     "somewhat of a kludge - simply search for the next text-item"
 
+    self moveToNextChangedAfter:self lastLineShown
+
+    "Modified: / 27-07-1998 / 12:29:24 / cg"
+    "Modified: / 23-07-2018 / 09:53:59 / Claus Gittinger"
+!
+
+moveToNextChangedAfter:startLine
+    "somewhat of a kludge - simply search for the next text-item"
+
     |start end lnNr max list|
 
-    start := self lastLineShown + 1.
+    start := startLine + 1.
 
     list := self list.
     max  := list size.
@@ -74,7 +85,7 @@
         self beepInEditor
     ].
 
-    "Modified: / 27.7.1998 / 12:29:24 / cg"
+    "Created: / 23-07-2018 / 09:53:43 / Claus Gittinger"
 !
 
 moveToPreviousChanged