libjava is a train wreck.

[Diego Novillo]

On 6/5/07 12:28 AM, Steve Kargl wrote:
> Can someone explain why libjava *must* commit binary files to the
> repository?  A merge of trunk to the fortran-experiments branch
> generated 70 conflicts that I need to resolve.

You should not have conflicts in libjava.  You may have botched a merger
earlier.  I never ran into this with the branches I've maintained.  Try
copying libjava out of trunk again.