diff options
| -rw-r--r-- | usr.bin/rcs/Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsprog.c | 3 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsprog.h | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/rcs/Makefile b/usr.bin/rcs/Makefile index c450f36e67f..e8a25aa140b 100644 --- a/usr.bin/rcs/Makefile +++ b/usr.bin/rcs/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.17 2005/10/16 10:12:59 xsa Exp $ +# $OpenBSD: Makefile,v 1.18 2005/10/18 16:20:31 xsa Exp $ .PATH: ${.CURDIR}/../cvs PROG= rcs -MAN= ci.1 co.1 ident.1 rcs.1 rcsclean.1 rcsdiff.1 rlog.1 +MAN= ci.1 co.1 ident.1 rcs.1 rcsclean.1 rcsdiff.1 rcsmerge.1 rlog.1 -SRCS= ci.c co.c ident.c rcsclean.c rcsdiff.c rcsprog.c rlog.c buf.c date.y \ - diff.c log.c rcs.c rcsnum.c strtab.c +SRCS= ci.c co.c ident.c rcsclean.c rcsdiff.c rcsmerge.c rcsprog.c rlog.c \ + buf.c date.y diff.c log.c rcs.c rcsnum.c strtab.c CPPFLAGS+=-I${.CURDIR}/../cvs -DRCSPROG LINKS= ${BINDIR}/rcs ${BINDIR}/ci ${BINDIR}/rcs ${BINDIR}/co \ diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c index f087f883026..ba6b4183888 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.32 2005/10/18 01:24:42 joris Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.33 2005/10/18 16:20:31 xsa Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -60,6 +60,7 @@ struct rcs_prog { { "co", checkout_main, checkout_usage }, { "rcsclean", rcsclean_main, rcsclean_usage }, { "rcsdiff", rcsdiff_main, rcsdiff_usage }, + { "rcsmerge", rcsmerge_main, rcsmerge_usage }, { "rlog", rlog_main, rlog_usage }, { "ident", ident_main, ident_usage }, }; diff --git a/usr.bin/rcs/rcsprog.h b/usr.bin/rcs/rcsprog.h index 7835895a459..d44b55c97d3 100644 --- a/usr.bin/rcs/rcsprog.h +++ b/usr.bin/rcs/rcsprog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.h,v 1.14 2005/10/18 01:22:14 joris Exp $ */ +/* $OpenBSD: rcsprog.h,v 1.15 2005/10/18 16:20:31 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -42,6 +42,7 @@ void checkout_usage(void); void checkin_usage(void); void rcsdiff_usage(void); void rcsclean_usage(void); +void rcsmerge_usage(void); void rlog_usage(void); void ident_usage(void); void (*usage)(void); @@ -56,6 +57,7 @@ int checkin_main(int, char **); int rcs_main(int, char **); int rcsdiff_main(int, char **); int rcsclean_main(int, char **); +int rcsmerge_main(int, char **); int rlog_main(int, char **); int ident_main(int, char **); |