[PATCH V2] patch: don't separate \r and \n when colorizing diff output
Sune Foldager
sune.foldager at me.com
Wed Jul 11 10:10:32 EDT 2018
It’s not in the repo as far as I can see, but ok then...
> On 11 Jul 2018, at 15.59, Yuya Nishihara <yuya at tcha.org> wrote:
>
>> On Wed, 11 Jul 2018 15:03:42 +0200, Sune Foldager via Mercurial-devel wrote:
>> # HG changeset patch
>> # User Sune Foldager <cryo at cyanite.org>
>> # Date 1531314149 -7200
>> # Wed Jul 11 15:02:29 2018 +0200
>> # Node ID dc12175e9e5ba1bcb8ed7658a9218211727a9c49
>> # Parent 4d5fb4062f0bb159230062701461fa6cab9b539b
>> patch: don't separate \r and \n when colorizing diff output
>
> V1 is already in. Can you send only the test?
>
>> +trailing whitespace
>> +
>> + $ sed -i 's/^dd$/dd \r/' a
>
> + tests/test-diff-color.t:56:
> + > $ sed -i 's/^dd$/dd \r/' a
> + don't use 'sed -i', use a temporary file
> + tests/test-diff-color.t:71:
> + > $ sed -i 's/\s*\r$//' a
> + don't use 'sed -i', use a temporary file
> + [1]
More information about the Mercurial-devel
mailing list