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