15 Feb
2021
15 Feb
'21
10:05 p.m.
On 15/02/2021 20:34, Mark Cave-Ayland wrote:
Great! I can take Philippe's v3 and add the extra comment during merge. I'll give the outstanding patches a test and push them to git if everything seems good.
This seems to work fine here, so I've pushed both this patch and your 40p patchset to git master.
Note: I ended up having to fix up the patches by hand after applying since each line was terminated with a ^M instead of a LF. Do you have any non-standard core.autocrlf settings in your git config?
ATB,
Mark.