Tools__TextMergeInfo.st
branchjv
changeset 12307 d7a3df44366a
parent 12288 2fa2855b6ba5
child 12431 9f0c59c742d5
--- a/Tools__TextMergeInfo.st	Fri Nov 16 10:56:44 2012 +0000
+++ b/Tools__TextMergeInfo.st	Fri Nov 30 14:25:59 2012 +0000
@@ -157,6 +157,18 @@
 
 !TextMergeInfo methodsFor:'merging'!
 
+mergeUsing: text
+
+    list := (text ? #()) asStringCollection.
+    listInfos := 
+        (1 to: list size) collect:[:lineNr|
+            (LineInfo line: lineNr resolution: #Merged )
+        ].
+    self changed:#resolution
+
+    "Created: / 30-11-2012 / 14:12:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 mergeUsingA: textA
 
     list := (textA ? #()) asStringCollection.
@@ -446,5 +458,5 @@
 !TextMergeInfo class methodsFor:'documentation'!
 
 version_SVN
-    ^ '$Id: Tools__TextMergeInfo.st 8049 2012-09-07 17:30:05Z vranyj1 $'
+    ^ '$Id: Tools__TextMergeInfo.st 8073 2012-11-30 14:25:59Z vranyj1 $'
 ! !