Beispiel #1
0
 /**
  * Computes diff between 3 sequences of strings.
  *
  * @param array $orig    The original lines to use.
  * @param array $final1  The first version to compare to.
  * @param array $final2  The second version to compare to.
  */
 function diff3(&$orig, &$final1, &$final2)
 {
     $diff_engine = new diff_engine();
     $diff_1 = $diff_engine->diff($orig, $final1);
     $diff_2 = $diff_engine->diff($orig, $final2);
     unset($engine);
     $this->_edits = $this->_diff3($diff_1, $diff_2);
 }
Beispiel #2
0
 /**
  * Computes diff between 3 sequences of strings.
  *
  * @param array &$orig		The original lines to use.
  * @param array &$final1		The first version to compare to.
  * @param array &$final2		The second version to compare to.
  * @param bool $preserve_cr	If true, \r\n and bare \r are replaced by a new line
  *							in the diff output
  */
 function diff3(&$orig, &$final1, &$final2, $preserve_cr = true)
 {
     $diff_engine = new diff_engine();
     $diff_1 = $diff_engine->diff($orig, $final1, $preserve_cr);
     $diff_2 = $diff_engine->diff($orig, $final2, $preserve_cr);
     unset($diff_engine);
     $this->_edits = $this->_diff3($diff_1, $diff_2);
 }