summaryrefslogtreecommitdiff
path: root/usr.bin/rcs
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2006-05-08 10:02:03 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2006-05-08 10:02:03 +0000
commit085298b9e6c389465c5cf8b319e2faa8aaf4a527 (patch)
treed0293a6008db885b5696d4b85a953bf8b59cae5b /usr.bin/rcs
parentbcf7d56f36b81c034316d13dae682715f0090d91 (diff)
add DIAGNOSTICS section.
Diffstat (limited to 'usr.bin/rcs')
-rw-r--r--usr.bin/rcs/rcsmerge.115
1 files changed, 14 insertions, 1 deletions
diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1
index 2d781cc98a2..282c31af2ea 100644
--- a/usr.bin/rcs/rcsmerge.1
+++ b/usr.bin/rcs/rcsmerge.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rcsmerge.1,v 1.10 2006/04/27 09:58:12 jmc Exp $
+.\" $OpenBSD: rcsmerge.1,v 1.11 2006/05/08 10:02:02 xsa Exp $
.\"
.\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
.\" All rights reserved.
@@ -96,6 +96,19 @@ Undo changes between revision 2.4 and 2.8 of
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 ,