From owner-freebsd-questions Mon Jun 18 22:33:31 2001 Delivered-To: freebsd-questions@freebsd.org Received: from web12007.mail.yahoo.com (web12007.mail.yahoo.com [216.136.172.215]) by hub.freebsd.org (Postfix) with SMTP id BABFB37B401 for ; Mon, 18 Jun 2001 22:33:29 -0700 (PDT) (envelope-from bsd2000au@yahoo.com.au) Message-ID: <20010619053329.16735.qmail@web12007.mail.yahoo.com> Received: from [203.20.237.207] by web12007.mail.yahoo.com; Tue, 19 Jun 2001 15:33:29 EST Date: Tue, 19 Jun 2001 15:33:29 +1000 (EST) From: =?iso-8859-1?q?Keith=20Spencer?= Subject: how do I use mergemaster? To: fbsd MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hi folks, I have successfully CVS upped with your help and seek to make installworld etc. I am using a cheat sheet and it tells me to now use.. /usr/sbin/mergemaster -v I am doing so but what do I do with it? It is asking me to install delete merge temporary files. What options do I choose? i= seems to give " problem, leaving to deal with" m= gives me some editor I have no idea how to use ...hmmm I press default to leave to deal and it does it for every file (lots) Id be here forever! ANY HELP IS APPRECIATED. I am tearing my hair out here Regards Keith _____________________________________________________________________________ http://messenger.yahoo.com.au - Yahoo! Messenger - Voice chat, mail alerts, stock quotes and favourite news and lots more! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message