Re: [PATCH 1/7] test: add merge style config test

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jun 10, 2021, 16:34 UTC
Message-ID: <60c23efe4405d_b25b1208e3@natae.notmuch>
In-Reply-To: <a819dd7d-e690-baa7-b6c8-2b1fabe51522@gmail.com>

Phillip Wood wrote:

Show 17 quoted lines

> On 10/06/2021 14:26, Felipe Contreras wrote:
> > Phillip Wood wrote:
> >> There are already diff3 tests for checkout
> > 
> > This file is not doing diff3 tests.
> > 
> > 
> > As stated above, it's testing different *combinations* of
> > merge.conflictstyle, diff3 is only *one* of the possibilities, another
> > possibility is:
> > 
> >    git -c merge.conflictstyle=diff3 checkout -m --conflict=merge
> > 
> > That is *not* a diff3 test.
> 
> I think that is an artificial distinction, it is testing the behavior of 
> checkout when merge.conflictStyle=diff3

That is one of the things it's testing, it's not the only thing it's testing, it's testing other things as well.

-- 
Felipe Contreras