Phillip Wood wrote: > 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
