diff options
| author | billf <billf@FreeBSD.org> | 1999-10-26 19:05:04 +0000 |
|---|---|---|
| committer | billf <billf@FreeBSD.org> | 1999-10-26 19:05:04 +0000 |
| commit | e55279d058091b8abbe23a7bb636f9ee58110824 (patch) | |
| tree | b131fef87e573576d13e4f64d0a5a21059f0b69d /usr.sbin | |
| parent | c3eee6e29ccf5984e261fe537dbcf14b8bc45952 (diff) | |
| download | FreeBSD-src-e55279d058091b8abbe23a7bb636f9ee58110824.zip FreeBSD-src-e55279d058091b8abbe23a7bb636f9ee58110824.tar.gz | |
Use $FreeBSD$ (instead of the author's $Revision$) to report the
version number now that we have it.
Reviewed by: author
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster | 4 | ||||
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 4 |
2 files changed, 2 insertions, 6 deletions
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:" |
