diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-15 06:58:04 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-15 06:58:04 +0000 |
| commit | 62af021f73c6087593eb47c427041d858fe5e493 (patch) | |
| tree | f63fc710980a6bfaaecdcc4887bcd25e70684977 /usr.bin/rcs/rcsprog.c | |
| parent | 46ae12169e313b2340d33da86a2bc7762b047cf0 (diff) | |
missing bits for a working merge(1). Built and enabled.
OK joris@ ray@.
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 40d65d1cf2c..c6f81881627 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.125 2006/05/11 09:43:19 xsa Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.126 2006/05/15 06:58:03 xsa Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -52,6 +52,7 @@ struct rcs_prog { { "rcsmerge", rcsmerge_main, rcsmerge_usage }, { "rlog", rlog_main, rlog_usage }, { "ident", ident_main, ident_usage }, + { "merge", merge_main, merge_usage }, }; struct rcs_wklhead rcs_temp_files; |