On Tue, Jun 26, 2018 at 9:05 PM Junio C Hamano wrote:
>
> Nicolas Dechesne writes:
>
> > i have noticed that merge.conflictstyle has an impact on the rerere
> > resolution. looking briefly at the source code, it seems that git
> > tries to discard the common ancestor diff3 bits, but what I am see
Nicolas Dechesne writes:
> i have noticed that merge.conflictstyle has an impact on the rerere
> resolution. looking briefly at the source code, it seems that git
> tries to discard the common ancestor diff3 bits, but what I am seeing
> is that if i do the following then it fails:
>
> 1. from a c
2 matches
Mail list logo
