--- a/Tools__TextMergeInfo.st	Wed Mar 21 12:48:24 2012 +0000
+++ b/Tools__TextMergeInfo.st	Wed Mar 21 14:05:42 2012 +0000
@@ -105,7 +105,7 @@
 
 mergeUsingA: textA
 
-    list := textA asStringCollection.
+    list := (textA ? #()) asStringCollection.
     listInfos := 
         (1 to: list size) collect:[:lineNr|
             (LineInfo line: lineNr resolution: #MergedUsingA )
@@ -117,7 +117,7 @@
 
 mergeUsingB: textB
 
-    list := textB asStringCollection.
+    list := (textB ? #())  asStringCollection.
     listInfos := 
         (1 to: list size) collect:[:lineNr|
             (LineInfo line: lineNr resolution: #MergedUsingB )
@@ -129,7 +129,7 @@
 
 mergeUsingBase: textBase
 
-    list := textBase asStringCollection.
+    list := (textBase ? #()) asStringCollection.
     listInfos := 
         (1 to: list size) collect:[:lineNr|
             (LineInfo line: lineNr resolution: #MergedUsingBase )
@@ -282,5 +282,5 @@
 !TextMergeInfo class methodsFor:'documentation'!
 
 version_SVN
-    ^ '$Id: Tools__TextMergeInfo.st 7950 2012-03-21 12:48:24Z vranyj1 $'
+    ^ '$Id: Tools__TextMergeInfo.st 7951 2012-03-21 14:05:42Z vranyj1 $'
 ! !

--- a/stx_libtool.st	Wed Mar 21 12:48:24 2012 +0000
+++ b/stx_libtool.st	Wed Mar 21 14:05:42 2012 +0000
@@ -527,13 +527,13 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'7946'"$"
+    ^ "$SVN-Revision:"'7948'"$"
 ! !
 
 !stx_libtool class methodsFor:'documentation'!
 
 version
-    ^ '$Id: stx_libtool.st 7948 2012-03-21 01:52:35Z vranyj1 $'
+    ^ '$Id: stx_libtool.st 7951 2012-03-21 14:05:42Z vranyj1 $'
 !
 
 version_CVS
@@ -541,5 +541,5 @@
 !
 
 version_SVN
-    ^ '$Id: stx_libtool.st 7948 2012-03-21 01:52:35Z vranyj1 $'
+    ^ '$Id: stx_libtool.st 7951 2012-03-21 14:05:42Z vranyj1 $'
 ! !