diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-10-18 16:20:32 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-10-18 16:20:32 +0000 |
| commit | c2cda5e17980798dfbdf7be30710d74612597597 (patch) | |
| tree | 7d330e6597e444c9a2e6dd1e3cd18c528b062c3b /usr.bin/rcs/rcsprog.h | |
| parent | 0939148c12661b498e45f24c8ae9447f77bf461e (diff) | |
more rcsmerge(1) bits;
Diffstat (limited to 'usr.bin/rcs/rcsprog.h')
| -rw-r--r-- | usr.bin/rcs/rcsprog.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 **); |