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 257fbeba4ca4..22235fd33feb 100644 --- a/usr.sbin/mergemaster/Makefile +++ b/usr.sbin/mergemaster/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/mergemaster/Makefile,v 1.9.32.1.6.1 2010/12/21 17:09:25 kensmith Exp $ SCRIPTS=mergemaster.sh MAN= mergemaster.8 diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index a8bafb7c667e..2c8825573461 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.41.2.3.4.1 2010/12/21 17:09:25 kensmith Exp $ .\" .Dd March 13, 2010 .Dt MERGEMASTER 8 diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 19381b7cf530..d0c1ec0ede7f 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -8,7 +8,7 @@ # Copyright 1998-2010 Douglas Barton # DougB@FreeBSD.org -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.72.2.6.4.1 2010/12/21 17:09:25 kensmith Exp $ PATH=/bin:/usr/bin:/usr/sbin |