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_at_crodrigues.orgReceived on Mon Jan 19 2004 - 07:21:46 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:37:39 UTC