Date: Sun, 30 Apr 2006 12:02:27 +0400 (MSD) From: Dmitry Morozovsky <marck@rinet.ru> To: Gordon Tetlow <gordon@freebsd.org> Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh Message-ID: <20060430120143.T57302@woozle.rinet.ru> In-Reply-To: <200604291821.k3TILije020756@repoman.freebsd.org> References: <200604291821.k3TILije020756@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 29 Apr 2006, Gordon Tetlow wrote: GT> gordon 2006-04-29 18:21:44 UTC GT> GT> FreeBSD src repository GT> GT> Modified files: GT> usr.sbin/mergemaster mergemaster.8 mergemaster.sh GT> Log: GT> Add auto upgrade capability to mergemaster. Thanks! It seems you missed SYNOPSIS flags line: Index: mergemaster.8 =================================================================== RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.8,v retrieving revision 1.35 diff -u -r1.35 mergemaster.8 --- mergemaster.8 29 Apr 2006 18:21:43 -0000 1.35 +++ mergemaster.8 30 Apr 2006 08:01:33 -0000 @@ -32,7 +32,7 @@ .Nd merge configuration files, et al during an upgrade .Sh SYNOPSIS .Nm -.Op Fl scrvahipCP +.Op Fl scrvahipCPU .Op Fl m Ar /path/to/sources .Op Fl t Ar /path/to/temp/root .Op Fl d Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060430120143.T57302>