summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/rcs/merge
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/rcs/merge')
-rw-r--r--gnu/usr.bin/rcs/merge/merge.12
-rw-r--r--gnu/usr.bin/rcs/merge/merge.c2
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 a4fd35b7986aa..6b8ea555a8a87 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 $FreeBSD$
+.Id $FreeBSD: src/gnu/usr.bin/rcs/merge/merge.1,v 1.6.60.1 2010/12/21 17:10:29 kensmith Exp $
.ds r \&\s-1RCS\s0
.TH MERGE 1 \*(Dt GNU
.SH NAME
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index aa127bf1c8ec8..8ca65673241d0 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", "$FreeBSD$")
+mainProg(mergeId, "merge", "$FreeBSD: src/gnu/usr.bin/rcs/merge/merge.c,v 1.5.60.1 2010/12/21 17:10:29 kensmith Exp $")
{
register char const *a;
char const *arg[3], *label[3], *edarg = 0;