/**
* Creates a new conflicted line
* @param string $base The line as present in the base branch
* @param string $head The line as present in the head branch
* @param type $branch_name The name of the head branch
*/
public function __construct($base, $head, $branch_name = '')
{
$this->base = $base;
$this->head = $head;
$line = '<<<<<<< HEAD' . "\n";
$line .= $base . "\n";
$line .= '=======' . "\n";
$line .= $head . "\n";
$line .= '>>>>>>> ' . $branch_name;
parent::__construct($line, parent::BOTH);
}
/**
* @param Point $a
* @param Point $b
* @param int $size
*/
function __construct(Point $a, Point $b, $size)
{
parent::__construct($a, $b);
$this->size = $size;
}
/**
* Constructor
*/
function __construct()
{
parent::__construct();
$this->availableProperties = array_merge($this->availableProperties, array('fillcolor', 'fillopacity', 'fill'));
}
