Malcolm.Wallace at cs.york.ac.uk
Thu Jun 26 08:18:02 EDT 2008
> When doing a darcs pull I got conflicts on HaXml/configure. Surely
> that should not be in the repo -- it's generated by autoconf or
> something isn't it?
HaXml's configure is a hand-written shell script, and should certainly
be in the repo. The conflict looks odd to me, like it could be applying
the patches in the wrong order.
But I don't see the conflict in any of my copies of the repo. Maybe you
made a local change?
More information about the Cvs-libraries