[m-dev.] for review: --shape-includes-inst

[Fergus Henderson]

On 19-Apr-1999, Zoltan Somogyi <zs at cs.mu.OZ.AU> wrote:
> 
> +++ stack_layout.m	1999/04/16 06:38:00
> @@ -115,8 +115,9 @@
> @@ -191,6 +192,9 @@
>  :- import_module hlds_data, hlds_pred, base_type_layout, prog_data, prog_out.
>  :- import_module (inst), code_util.
>  :- import_module assoc_list, bool, string, int, require.
> +<<<<<<< stack_layout.m
> +:- import_module map, std_util, term, set.
> +=======

You have some unresolved cvs conflicts in that file.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------