From: Sergey Organov <sorganov@gmail.com>
Date: Thu, 03 Jun 2021 09:48:40 GMT
Subject: Re: The git spring cleanup challenge
Message-ID: <87pmx32s93.fsf@osv.gnss.ru>
In-Reply-To: <CABPp-BH7f+sM_POEsSSvmz_p=oEzHQcvTk_cEhTGeb-yq9fq_A@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> On Tue, Jun 1, 2021 at 3:39 PM Sergey Organov <sorganov@gmail.com> wrote:
>>
>> Felipe Contreras <felipe.contreras@gmail.com> writes:
>>
>> > Hello,
>> >
>>
>> [...]
>>
>> > These are the configurations I've chosen:
>> >
>> >   [merge]
>> >     conflictstyle = diff3
>> >   [sendemail]
>> >     smtpserver = /usr/bin/msmtp
>> >
>>
>> [pull]
>>         rebase = merges
>> [push]
>>         default = simple
>> [rerere]
>>         enabled = true
>>         autoupdate = true
>> [diff]
>>         algorithm = patience
>
> Any reason for patience vs. histogram?

No, I only tried the 'patience', didn't try 'histogram'.

-- Sergey Organov