Diff2.st
changeset 14840 6cc4674bfd18
parent 14009 27022a1ba8f6
child 14903 f0d17117b5e9
--- a/Diff2.st	Tue Nov 18 15:23:44 2014 +0100
+++ b/Diff2.st	Tue Nov 18 19:12:59 2014 +0100
@@ -522,12 +522,12 @@
 !
 
 findCandidateFrom: candidates forLine: file2index startingAt: lowIndex
-	"Find the index k in the given subrange of candidates where file2index falls strictly between the file2indexes of the kth and k+1th candidates. If no such k exists, return 0."
-	(lowIndex to: candidates size) do: [ :k |
-		(candidates at: k) file2index >= file2index ifTrue: [^ 0].
-		(k = candidates size or: [ (candidates at: k + 1) file2index > file2index ])
-			ifTrue: [^ k] ].
-	^ 0
+        "Find the index k in the given subrange of candidates where file2index falls strictly between the file2indexes of the kth and k+1th candidates. If no such k exists, return 0."
+        lowIndex to: candidates size do: [ :k |
+                (candidates at: k) file2index >= file2index ifTrue: [^ 0].
+                (k = candidates size or: [ (candidates at: k + 1) file2index > file2index ])
+                        ifTrue: [^ k] ].
+        ^ 0
 !
 
 mergeCandidates: candidates file1index: file1index file2indices: file2indices 
@@ -838,10 +838,10 @@
 !Diff2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.3 2014-02-25 07:00:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.4 2014-11-18 18:12:59 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.3 2014-02-25 07:00:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Diff2.st,v 1.4 2014-11-18 18:12:59 cg Exp $'
 ! !