diff options
| -rw-r--r-- | phpBB/includes/diff/diff.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index 1533c4d7f3..2adc3a3e6e 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -516,6 +516,7 @@ class diff3 extends diff $label_end = array('>>>>>>> ' . $label2); $lines = array_merge($lines, $label_start, $edit->final1, $label_mid, $edit->final2, $label_end); + $this->_conflicting_blocks++; } else { @@ -527,6 +528,16 @@ class diff3 extends diff } /** + * Return merged output (used by the renderer) + * + * @return mixed the merged output + */ + function merged_output() + { + return $this->get_conflicts_content(); + } + + /** * Merge the output and use the new file code for conflicts */ function merged_new_output() |