aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/merge/merge.c
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>1997-03-11 00:08:01 +0000
committercvs2svn <cvs2svn@FreeBSD.org>1997-03-11 00:08:01 +0000
commit401fd2032d7b17d3805379b7d8748b8fcc9e855f (patch)
treeacb6be0558ee5b55e4d2660533c5ceee348ffc5b /gnu/usr.bin/rcs/merge/merge.c
parent17d68b04ff9fcd2dc603fc7fcd82bddd7ae7dc22 (diff)
Diffstat (limited to 'gnu/usr.bin/rcs/merge/merge.c')
-rw-r--r--gnu/usr.bin/rcs/merge/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index b33d1cba3792..9e8ebb017724 100644
--- a/gnu/usr.bin/rcs/merge/merge.c
+++ b/gnu/usr.bin/rcs/merge/merge.c
@@ -41,7 +41,7 @@ badoption(a)
}
-mainProg(mergeId, "merge", "$Id: merge.c,v 1.1.1.1 1993/06/18 04:22:14 jkh Exp $")
+mainProg(mergeId, "merge", "$Id: merge.c,v 1.1.1.1.8.1 1996/02/23 09:31:54 peter Exp $")
{
register char const *a;
char const *arg[3], *label[3], *edarg = 0;