diff options
Diffstat (limited to 'gnu/usr.bin/rcs/merge')
-rw-r--r-- | gnu/usr.bin/rcs/merge/merge.1 | 2 | ||||
-rw-r--r-- | gnu/usr.bin/rcs/merge/merge.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/rcs/merge/merge.1 b/gnu/usr.bin/rcs/merge/merge.1 index e4860d2..62c14d2 100644 --- a/gnu/usr.bin/rcs/merge/merge.1 +++ b/gnu/usr.bin/rcs/merge/merge.1 @@ -2,7 +2,7 @@ .ds Rv \\$3 .ds Dt \\$4 .. -.Id $Id: merge.1,v 5.7 1995/06/01 16:23:43 eggert Exp $ +.Id $FreeBSD$ .TH MERGE 1 \*(Dt GNU .SH NAME merge \- three-way file merge diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c index 44d33a3..aa127bf 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.8 1995/06/16 06:19:24 eggert Exp $") +mainProg(mergeId, "merge", "$FreeBSD$") { register char const *a; char const *arg[3], *label[3], *edarg = 0; |