Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Jun 2001 16:28:04 -0400 (EDT)
From:      Garrett Wollman <wollman@khavrinen.lcs.mit.edu>
To:        darren@enchantress.ca
Cc:        stable@FreeBSD.org, dougb@FreeBSD.org
Subject:   Re: Problems with mergemaster
Message-ID:  <200106132028.QAA04827@khavrinen.lcs.mit.edu>
In-Reply-To: <mit.lcs.mail.freebsd-stable/045401c0f426$4a45d900$04c8c80a@enchantress.ab.ca>
References:  <mit.lcs.mail.freebsd-stable/20010608134705.19635.qmail@web14701.mail.yahoo.com> <mit.lcs.mail.freebsd-stable/004001c0f030$36a0d3e0$0600020a@frontend> <mit.lcs.mail.freebsd-stable/20010612120958.G10614@tao.org.uk> <mit.lcs.mail.freebsd-stable/20010613102058.F5486@wantadilla.lemis.com>

next in thread | previous in thread | raw e-mail | index | archive | help
In article <mit.lcs.mail.freebsd-stable/045401c0f426$4a45d900$04c8c80a@enchantress.ab.ca> you write:

>   *** Problem installing ./foo , it will remain to merge by hand

That's because someone(tm) removed the `-c' options to `install' from
the -stable version of mergemaster, even though the -stable version of
`install' still needs them.

-GAWollman

-- 
Garrett A. Wollman   | O Siem / We are all family / O Siem / We're all the same
wollman@lcs.mit.edu  | O Siem / The fires of freedom 
Opinions not those of| Dance in the burning flame
MIT, LCS, CRS, or NSA|                     - Susan Aglukark and Chad Irschick

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200106132028.QAA04827>