diff options
author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-15 07:43:04 +0000 |
---|---|---|
committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-15 07:43:04 +0000 |
commit | 37b9bfead1c8d45cc174c9ed1ea9ce2f648f6e9a (patch) | |
tree | 258690477ae474d613b364c6263cacfade0276ab /usr.bin/rcs/rcsmerge.1 | |
parent | fa645c7f52d57bda36b194458777194639e4a902 (diff) |
.Xr merge(1)
Diffstat (limited to 'usr.bin/rcs/rcsmerge.1')
-rw-r--r-- | usr.bin/rcs/rcsmerge.1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1 index a57ffd01459..a44540e5436 100644 --- a/usr.bin/rcs/rcsmerge.1 +++ b/usr.bin/rcs/rcsmerge.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsmerge.1,v 1.12 2006/05/09 14:03:55 jmc Exp $ +.\" $OpenBSD: rcsmerge.1,v 1.13 2006/05/15 07:43:03 xsa Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> .\" All rights reserved. @@ -109,6 +109,7 @@ An error occurred. .Xr ci 1 , .Xr co 1 , .Xr ident 1 , +.Xr merge 1 , .Xr rcs 1 , .Xr rcsclean 1 , .Xr rcsdiff 1 , |