From: Sergey Organov <sorganov@gmail.com>
Date: Tue, 01 Jun 2021 22:33:40 GMT
Subject: Re: The git spring cleanup challenge
Message-ID: <87wnrd6wqj.fsf@osv.gnss.ru>
In-Reply-To: <60b5d281552d6_e359f20828@natae.notmuch>

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
[merge]
        conflictStyle = diff3

-- Sergey Organov