[PHP-DOC] cvs: phpdoc /en/reference/xdiff/functions xdiff-string-merge3.xml

[Mehdi Achour]

didou           Tue Feb 10 06:34:09 2004 EDT

  Modified files:              
    /phpdoc/en/reference/xdiff/functions        xdiff-string-merge3.xml 
  Log:
  space
  
http://cvs.php.net/diff.php/phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml
diff -u phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml:1.1 
phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml:1.2
--- phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml:1.1     Mon Feb  9 
13:09:54 2004
+++ phpdoc/en/reference/xdiff/functions/xdiff-string-merge3.xml Tue Feb 10 06:34:08 
2004
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
   <refentry id="function.xdiff-string-merge3">
    <refnamediv>
@@ -18,7 +18,7 @@
      <methodparam choice="opt"><type>string</type><parameter>&amp; 
error</parameter></methodparam>
     </methodsynopsis>
     <para>
-     <function>xdiff_string_merge3</function>merges strings 
+     <function>xdiff_string_merge3</function> merges strings 
      <parameter>str1</parameter>, <parameter>str2</parameter> and 
      <parameter>str3</parameter> into one.
     </para>