.Xr rcsmerge(1) + one style nitpick;

7 files changed, 15 insertions, 9 deletions

diff --git a/usr.bin/rcs/ci.1 b/usr.bin/rcs/ci.1
index c2fd5eb3375..34713719d45 100644
--- a/usr.bin/rcs/ci.1
+++ b/usr.bin/rcs/ci.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ci.1,v 1.12 2005/10/18 15:03:31 jmc Exp $
+.\"     $OpenBSD: ci.1,v 1.13 2005/10/19 16:15:36 xsa Exp $
 .\"
 .\" Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
 .\" All rights reserved.
@@ -120,4 +120,5 @@ are prepended to the argument list.
 .Xr rcs 1 ,
 .Xr rcsclean 1 ,
 .Xr rcsdiff 1 ,
+.Xr rcsmerge 1 ,
 .Xr rlog 1
diff --git a/usr.bin/rcs/co.1 b/usr.bin/rcs/co.1
index 8e588c02e9e..0c257ac23f6 100644
--- a/usr.bin/rcs/co.1
+++ b/usr.bin/rcs/co.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: co.1,v 1.7 2005/10/16 11:53:37 niallo Exp $
+.\"     $OpenBSD: co.1,v 1.8 2005/10/19 16:15:36 xsa Exp $
 .\"
 .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
 .\" All rights reserved.
@@ -116,4 +116,5 @@ are prepended to the argument list.
 .Xr rcs 1 ,
 .Xr rcsclean 1 ,
 .Xr rcsdiff 1 ,
+.Xr rcsmerge 1 ,
 .Xr rlog 1
diff --git a/usr.bin/rcs/ident.1 b/usr.bin/rcs/ident.1
index 93abb601eb3..8331a592984 100644
--- a/usr.bin/rcs/ident.1
+++ b/usr.bin/rcs/ident.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ident.1,v 1.1 2005/10/06 16:16:45 xsa Exp $
+.\"	$OpenBSD: ident.1,v 1.2 2005/10/19 16:15:36 xsa Exp $
 .\"
 .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
 .\" All rights reserved.
@@ -50,4 +50,5 @@ Display version information and exit.
 .Xr rcs 1 ,
 .Xr rcsclean 1 ,
 .Xr rcsdiff 1 ,
+.Xr rcsmerge 1 ,
 .Xr rlog 1
diff --git a/usr.bin/rcs/rcsclean.1 b/usr.bin/rcs/rcsclean.1
index 22d5bcc871e..bd8bd9b1350 100644
--- a/usr.bin/rcs/rcsclean.1
+++ b/usr.bin/rcs/rcsclean.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: rcsclean.1,v 1.5 2005/10/17 12:50:46 jmc Exp $
+.\"     $OpenBSD: rcsclean.1,v 1.6 2005/10/19 16:15:36 xsa Exp $
 .\"
 .\" Copyright (c) 2005 Joris Vink <joris@openbsd.org>
 .\" All rights reserved.
@@ -61,4 +61,5 @@ are prepended to the argument list.
 .Xr ident 1 ,
 .Xr rcs 1 ,
 .Xr rcsdiff 1 ,
+.Xr rcsmerge 1 ,
 .Xr rlog 1
diff --git a/usr.bin/rcs/rcsclean.c b/usr.bin/rcs/rcsclean.c
index e7a8ee8bdbb..387a0363646 100644
--- a/usr.bin/rcs/rcsclean.c
+++ b/usr.bin/rcs/rcsclean.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsclean.c,v 1.8 2005/10/18 01:22:14 joris Exp $	*/
+/*	$OpenBSD: rcsclean.c,v 1.9 2005/10/19 16:15:36 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -170,7 +170,7 @@ rcsclean_file(char *fname, RCSNUM *rev)
 	free(c1);
 	free(c2);
 
-	if (match) {
+	if (match == 1) {
 		if (verbose == 1)
 			printf("rm -f %s\n", fname);
 		if (nflag == 0)
diff --git a/usr.bin/rcs/rcsdiff.1 b/usr.bin/rcs/rcsdiff.1
index 2160dd25f43..f27dbd8bd6f 100644
--- a/usr.bin/rcs/rcsdiff.1
+++ b/usr.bin/rcs/rcsdiff.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: rcsdiff.1,v 1.8 2005/10/17 12:49:33 jmc Exp $
+.\"     $OpenBSD: rcsdiff.1,v 1.9 2005/10/19 16:15:36 xsa Exp $
 .\"
 .\" Copyright (c) 2005 Joris Vink <joris@openbsd.org>
 .\" All rights reserved.
@@ -72,4 +72,5 @@ are prepended to the argument list.
 .Xr ident 1 ,
 .Xr rcs 1 ,
 .Xr rcsclean 1 ,
+.Xr rcsmerge 1 ,
 .Xr rlog 1
diff --git a/usr.bin/rcs/rlog.1 b/usr.bin/rcs/rlog.1
index 269fbad1a2e..a058b169eb7 100644
--- a/usr.bin/rcs/rlog.1
+++ b/usr.bin/rcs/rlog.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: rlog.1,v 1.1 2005/10/12 16:41:29 xsa Exp $
+.\"     $OpenBSD: rlog.1,v 1.2 2005/10/19 16:15:36 xsa Exp $
 .\"
 .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
 .\" All rights reserved.
@@ -58,4 +58,5 @@ are prepended to the argument list.
 .Xr ident 1 ,
 .Xr rcs 1 ,
 .Xr rcsclean 1 ,
-.Xr rcsdiff 1
+.Xr rcsdiff 1 ,
+.Xr rcsmerge 1