[m-rev.] trivial diff: merge r1.486 and r1.487 of make_hlds.m correctly

[Julien Fischer]

On Tue, 28 Dec 2004, Ralph Becket wrote:

> Julien Fischer, Friday, 24 December 2004:
> >
> > The solver type stuff Ralph committed recently
> > clobbered the changes made in the previous version of make_hlds.m.
> > This caused invalid/conflicting_tabling_pragmas to fail.
>
> How odd, I did cvs update just prior to committing and there were no
> clashes.

There weren't any clashes; you just deleted the previous set of
changes entirely.  I think it was because you copied some of the
files from one workspace to the other (at least I think you did).
No matter, it's all fixed now.

Cheers,
Julien.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------