Date: Mon, 19 Jan 2004 11:21:40 -0500 From: Craig Rodrigues <rodrigc@crodrigues.org> To: rihad <rihad@mail.ru> Cc: freebsd-current@freebsd.org Subject: Re: question on mergemaster Message-ID: <20040119162140.GA37568@crodrigues.org> In-Reply-To: <400C012E.4040002@mail.ru> References: <400C012E.4040002@mail.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jan 19, 2004 at 08:09:18PM +0400, rihad wrote: > Hi. I was wondering if there are any improvements planned to be made to > mergemaster? After today's cvsup I had to sit and keep pressing either > "q" (to break out of the pager) or "i" to accept the new file. This *is* > boring, considering there seemed to be no end to them and I eventually > killed mergemaster, because I had started to get nervous and make silly > typos :). Read this e-mail by Mike Makonnen which explains what to do in mergemaster in this case: http://lists.freebsd.org/pipermail/freebsd-current/2004-January/018944.html -- Craig Rodrigues http://crodrigues.org rodrigc@crodrigues.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040119162140.GA37568>