From e55279d058091b8abbe23a7bb636f9ee58110824 Mon Sep 17 00:00:00 2001 From: billf Date: Tue, 26 Oct 1999 19:05:04 +0000 Subject: Use $FreeBSD$ (instead of the author's $Revision$) to report the version number now that we have it. Reviewed by: author --- usr.sbin/mergemaster/mergemaster | 4 +--- usr.sbin/mergemaster/mergemaster.sh | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/mergemaster/mergemaster b/usr.sbin/mergemaster/mergemaster index 3fb0ac2..6fcf752 100755 --- a/usr.sbin/mergemaster/mergemaster +++ b/usr.sbin/mergemaster/mergemaster @@ -9,13 +9,11 @@ # Doug@gorean.org # $FreeBSD$ -# $Revision: 1.36 $ -# $Date: 1999/09/10 20:56:33 $ PATH=/bin:/usr/bin:/usr/sbin display_usage () { - VERSION_NUMBER=`grep "[$]Revision:" $0 | cut -d ' ' -f 3` + VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` echo "mergemaster version ${VERSION_NUMBER}" echo "Usage: mergemaster [-scrvah] [-m /path] [-t /path] [-d] [-u N] [-w N]" echo "Options:" diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 3fb0ac2..6fcf752 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -9,13 +9,11 @@ # Doug@gorean.org # $FreeBSD$ -# $Revision: 1.36 $ -# $Date: 1999/09/10 20:56:33 $ PATH=/bin:/usr/bin:/usr/sbin display_usage () { - VERSION_NUMBER=`grep "[$]Revision:" $0 | cut -d ' ' -f 3` + VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` echo "mergemaster version ${VERSION_NUMBER}" echo "Usage: mergemaster [-scrvah] [-m /path] [-t /path] [-d] [-u N] [-w N]" echo "Options:" -- cgit v1.1