Show 17 quoted lines
> On Wed, Jun 9, 2021 at 3:29 PM Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
> > We want to test different combinations of merge.conflictstyle, and a new
> > file is the best place to do that.
> >
> > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> > ---
> > diff --git a/t/t6440-config-conflict-markers.sh b/t/t6440-config-conflict-markers.sh
> > @@ -0,0 +1,44 @@
> > +fill () {
> > + for i
> > + do
> > + echo "$i"
> > + done
> > +}
>
> This seems to duplicate the behavior of test_write_lines()...Right, I'll update the patch.
The above function is used in:
t6440-config-conflict-markers.sh
t7201-co.sh
So those two probably should be updated.
Cheers.
Felipe Contreras <felipe.contreras@gmail.com>