On 01/03/18 20:29, Junio C Hamano wrote:
> Phillip Wood writes:
>
>> @@ -887,8 +892,8 @@ sub merge_hunk {
>> $o_cnt = $n_cnt = 0;
>> for ($i = 1; $i < @{$prev->{TEXT}}; $i++) {
>> my $line = $prev->{TEXT}[$i];
>> -if ($line =~ /^\+/)
Phillip Wood writes:
> @@ -887,8 +892,8 @@ sub merge_hunk {
> $o_cnt = $n_cnt = 0;
> for ($i = 1; $i < @{$prev->{TEXT}}; $i++) {
> my $line = $prev->{TEXT}[$i];
> - if ($line =~ /^\+/) {
> - $n_cnt++;
> +
From: Phillip Wood
When a file has no trailing new line at the end diff records this by
appending "\ No newline at end of file" below the last line of the
file. This line should not be counted in the hunk header. Fix the
splitting and coalescing code to count files
3 matches
Mail list logo