Re: [Automake-commit] [SCM] GNU Automake branch, java-work, updated. v1.11-458-g60bd0bf

[Stefano Lattarini]

On Friday 26 August 2011, Ralf Wildenhues wrote:
> Hi Stefano,
> 
> * Stefano Lattarini wrote on Thu, Aug 25, 2011 at 09:23:12PM CEST:
> > This is an automated email from the git hooks/post-receive script. It was
> > generated because a ref change was pushed to the repository containing
> > the project "GNU Automake".
> > 
> > http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=60bd0bf85380e6cabb50ff07cec3366c18f170b2
> > 
> > The branch, java-work has been updated
> >        via  60bd0bf85380e6cabb50ff07cec3366c18f170b2 (commit)
> >        via  236ad0bcb351a6e0795a69f272646bd2201b4056 (commit)
> >        via  bbddd445708efd8e7a484645f7ebf9b2a3a76102 (commit)
> >       from  036767871101be12266ca04f9efe1957727744de (commit)
> 
> > commit 60bd0bf85380e6cabb50ff07cec3366c18f170b2
> > Merge: 0367678 236ad0b
> > Author: Stefano Lattarini <address@hidden>
> > Date:   Thu Aug 25 21:20:57 2011 +0200
> > 
> >     Merge branch 'maint' into java-work
> >     
> >     * maint:
> >       tests: list "forgotten" test script in TESTS
> >       ylwrap: fix unusual indentation whitespace
> 
> > --- a/tests/Makefile.in
> > +++ b/tests/Makefile.in
> > @@ -723,7 +723,11 @@ java.test \
> >  java2.test \
> >  java3.test \
> >  java-check.test \
> > +<<<<<<< HEAD
> >  java-clean.test \
> > +=======
> > +java-empty-classpath.test \
> > +>>>>>>> maint
> >  javaprim.test \
> >  javasubst.test \
> >  javaflags.test \
>
Ouch, again?!

> Can you push a regenerated Makefile.in file?
> 
Of course.  Done already.

Sorry for the noise,
  Stefano