=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.1,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- src/usr.bin/rcs/rcsmerge.1 2007/05/31 19:20:15 1.14 +++ src/usr.bin/rcs/rcsmerge.1 2010/09/03 11:09:29 1.15 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsmerge.1,v 1.14 2007/05/31 19:20:15 jmc Exp $ +.\" $OpenBSD: rcsmerge.1,v 1.15 2010/09/03 11:09:29 jmc Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria .\" All rights reserved. @@ -14,7 +14,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: September 3 2010 $ .Dt RCSMERGE 1 .Os .Sh NAME @@ -80,6 +80,19 @@ If set, this variable should contain a list of space-delimited options that are prepended to the argument list. .El +.Sh EXIT STATUS +The +.Nm +utility exits with one of the following values: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It 0 +No overlaps. +.It 1 +Overlaps were found. +.It 2 +An error occurred. +.El .Sh EXAMPLES Merge differences between revision 1.4 and 1.8 of .Pa foo.c @@ -92,19 +105,6 @@ overwriting the working copy: .Pp .Dl $ rcsmerge -r2.8 -r2.4 foo.c -.Sh DIAGNOSTICS -The -.Nm -utility exits with one of the following values: -.Pp -.Bl -tag -width Ds -compact -offset indent -.It 0 -No overlaps. -.It 1 -Overlaps were found. -.It 2 -An error occurred. -.El .Sh SEE ALSO .Xr ci 1 , .Xr co 1 ,