question on mergemaster

Craig Rodrigues rodrigc at
Mon Jan 19 08:21:46 PST 2004

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:

Craig Rodrigues
rodrigc at

More information about the freebsd-current mailing list