public function isLineNumberAffected($line)
    {
        // Added lines also affect the ones afterwards in conflict resolution,
        // because they are added in between.
        $bleed = ($this->type == self::ADDED ? 1 : 0);
        return ($line >= $this->start && $line <= $this->end + $bleed);
    }
public function isLineNumberAffected($line)
    {
        // Added lines also affect the ones afterwards in conflict resolution,
        // because they are added in between.
        $bleed = ($this->type == self::ADDED ? 1 : 0);
        return ($line >= $this->start && $line <= $this->end + $bleed);
    }
public function isLineNumberAffected ( $ line ) { // Added lines also affect the ones afterwards in conflict resolution, // because they are added in between. $ bleed = ( $ this -> type == self :: ADDED ? 1 : 0 ) ; return ( $ line >= $ this -> start && $ line <= $ this -> end + $ bleed ) ; }
Test whether the hunk is to be considered for a conflict resolution.

@param int $line
The line number in the original text to test.

@return bool
Whether the line is affected by the hunk.
Test whether the hunk is to be considered for a conflict resolution .