[fpc-devel] AdjustLineBreaks: fixed in trunk, broken in fixes_3_2 (?)

[Marco van de Voort]

Op 17-12-2023 om 17:49 schreef Marco van de Voort via fpc-devel:
>
> Op 17-12-2023 om 17:27 schreef Bart via fpc-devel:
>>   I would request that the changes from commit 1c4151d8 are merged to 
>> fixes_3_2.
>
> I'm currently trying to make a dent in the merging backlog that the 
> transition to git made.
>
> I'm trying to merge as much as possible in order, and this one still 
> doesn't merge cleanly, so it will have to wait till I'm a further in 
> the merge process.
>
Never mind, it is merged. The road blocks turned out to be  in the 
dotted RTL related revisions (since it is a pchar based routine), so in 
the end I manually merged.