bircher / php-merge

src/PhpMerge/MergeConflict.php

Doc Comments +2 added lines, -3 removed lines

@@ -71,10 +71,9 @@
      *   The conflicting line changes from the first source.
      * @param string[] $local
      *   The conflicting line changes from the second source.
-     * @param int $line
-     *   The line number in the original text.
-     * @param int $merged
+     * @param integer $mergedLine
      *   The line number in the merged text.
+     * @param integer $baseLine
      */
     public function __construct($base, $remote, $local, $baseLine, $mergedLine)
     {

src/PhpMerge/PhpMerge.php

Doc Comments +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
      * @param MergeConflict[] $conflicts
      *   The merge conflicts.
      *
-     * @return string[]
+     * @return string
      *   The merged text.
      */
     protected static function mergeHunks($base, $remote, $local, &$conflicts = [])