for review: fix to Andrew's CVS merge errors

[Andrew Bromage]

G'day all.

Fergus Henderson wrote:

> compiler/modecheck_unify.m:
> 	Fix some errors that bromage introduced when merging in
> 	stayl's changes.

D'oh!  Let me just wipe this egg off...

Incidentally, CVS has can share the blame here.  There was exactly one
conflict, and it looked like this:

modecheck_unification(lambda_goal(...), ...) :-
	(
	... % My version of modecheck_unification.
	).

<<<<<<<<< modecheck_unify.m
=========
	% The last five lines of Simon's version of modecheck_unification.
	).

>>>>>>>>> 1.whatever

(You saw it right: no "from" diff.)

Now while I should have been more careful with that five ending than I
was (even though CVS didn't report it as something to be "merged"), the
other hunk of Simon's changes was silently dropped without so much as a
"<<<" from CVS.  Bizarre.

The moral of the story: Don't trust CVS to find conflicts for you.
Always compile after a "cvs update".  (Or get Fergus to do it for you.)

> Index: modecheck_unify.m
> ===================================================================

My bit of the diff looks fine.  Thanks, Fergus.

Cheers,
Andrew Bromage