summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbillf <billf@FreeBSD.org>1999-10-25 21:51:04 +0000
committerbillf <billf@FreeBSD.org>1999-10-25 21:51:04 +0000
commit16c187b39ba701e4582dc40616a865e9f2a94b61 (patch)
tree77634703acd8109e82e67d7b112a29813f3ab1b1 /usr.sbin
parent41000ec44dd05d8735ad3527ea99c06b57ecfc91 (diff)
downloadFreeBSD-src-16c187b39ba701e4582dc40616a865e9f2a94b61.zip
FreeBSD-src-16c187b39ba701e4582dc40616a865e9f2a94b61.tar.gz
Add $FreeBSD$
Diffstat (limited to 'usr.sbin')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster1
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster b/usr.sbin/mergemaster/mergemaster
index beb65b2..3fb0ac2 100755
--- a/usr.sbin/mergemaster/mergemaster
+++ b/usr.sbin/mergemaster/mergemaster
@@ -8,6 +8,7 @@
# Copyright 1998, 1999 Douglas Barton
# Doug@gorean.org
+# $FreeBSD$
# $Revision: 1.36 $
# $Date: 1999/09/10 20:56:33 $
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index beb65b2..3fb0ac2 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -8,6 +8,7 @@
# Copyright 1998, 1999 Douglas Barton
# Doug@gorean.org
+# $FreeBSD$
# $Revision: 1.36 $
# $Date: 1999/09/10 20:56:33 $
OpenPOWER on IntegriCloud