diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1994-11-22 10:58:58 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1994-11-22 10:58:58 +0000 |
| commit | 140932d6d85b561ad06abe5006a5e973a7713c45 (patch) | |
| tree | be1d2469fd1ab2ab0df6164fbc91fb7bbbdd80f5 /gnu/usr.bin/rcs/rcsmerge | |
| parent | 324ec40db3d437d18da21aa07a7ae4d4ecd9c157 (diff) | |
Diffstat (limited to 'gnu/usr.bin/rcs/rcsmerge')
| -rw-r--r-- | gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/rcs/rcsmerge/rcsmerge.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 index 82871b033bfd..0d819e01dd56 100644 --- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 +++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 @@ -2,7 +2,7 @@ .ds Rv \\$3 .ds Dt \\$4 .. -.Id $Id: rcsmerge.1,v 5.3 1991/08/19 03:13:55 eggert Exp $ +.Id rcsmerge.1,v 1.1.1.1 1993/06/18 04:22:16 jkh Exp .ds r \&\s-1RCS\s0 .if n .ds - \%-- .if t .ds - \(em diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c index e5d439452789..72d4130e3b52 100644 --- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c +++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c @@ -34,7 +34,10 @@ Report problems and direct all questions to: -/* $Log: rcsmerge.c,v $ +/* rcsmerge.c,v + * Revision 1.1.1.1 1993/06/18 04:22:16 jkh + * Updated GNU utilities + * * Revision 5.7 1991/11/20 17:58:09 eggert * Don't Iopen(f, "r+"); it's not portable. * @@ -98,7 +101,7 @@ Report problems and direct all questions to: static char const co[] = CO; -mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 5.7 1991/11/20 17:58:09 eggert Exp $") +mainProg(rcsmergeId, "rcsmerge", "rcsmerge.c,v 1.1.1.1 1993/06/18 04:22:16 jkh Exp") { static char const cmdusage[] = "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] [-p] [-Vn] file"; |