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.c | |
parent | 0939148c12661b498e45f24c8ae9447f77bf461e (diff) |
more rcsmerge(1) bits;
Diffstat (limited to 'usr.bin/rcs/rcsprog.c')
-rw-r--r-- | usr.bin/rcs/rcsprog.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 }, }; |