===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/merge.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/rcs/merge.1	2007/05/31 19:20:15	1.2
+++ src/usr.bin/rcs/merge.1	2010/10/28 15:08:50	1.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: merge.1,v 1.2 2007/05/31 19:20:15 jmc Exp $
+.\"	$OpenBSD: merge.1,v 1.3 2010/10/28 15:08:50 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
 .\" 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: October 28 2010 $
 .Dt MERGE 1
 .Os
 .Sh NAME
@@ -48,7 +48,7 @@
 but does not warn about conflicts.
 .It Fl L Ar label
 Specifies labels to be used in place of corresponding file names
-in conflicts reports.
+in conflict reports.
 May be given up to three times.
 .It Fl p
 Print result to standard output.