Elijah Newren <newren@xxxxxxxxx> writes: > On Tue, Jun 1, 2021 at 3:39 PM Sergey Organov <sorganov@xxxxxxxxx> wrote: >> >> Felipe Contreras <felipe.contreras@xxxxxxxxx> 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
