diff options
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 2 | ||||
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile index c00d18010be7..31e8aafd6252 100644 --- a/usr.sbin/mergemaster/Makefile +++ b/usr.sbin/mergemaster/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/mergemaster/Makefile,v 1.3.2.1 1999/11/03 20:58:47 billf Exp $ MAINTAINER= billf@FreeBSD.org MAINTAINER+= doug@gorean.org diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index d78eeabc8a19..f08eb6563ee1 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.4.2.2 2000/03/06 11:36:25 sheldonh Exp $ .\" .Dd September 10, 1999 .Dt MERGEMASTER 8 diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 330db745f5b3..0592d5645d73 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -8,7 +8,7 @@ # Copyright 1998, 1999 Douglas Barton # Doug@gorean.org -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.4.2.1 1999/11/03 20:58:47 billf Exp $ PATH=/bin:/usr/bin:/usr/sbin |