diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2008-02-24 05:45:17 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2008-02-24 05:45:17 +0000 |
| commit | a9c219fa3cec18ef9f30edec6fa106bf0e2d423d (patch) | |
| tree | 50188ea5c781ddc35338e77f24e94f1aa22aae1c /usr.sbin/mergemaster | |
| parent | ba209d619d07461cc752dcdd596ab0d9b50e847a (diff) | |
This commit was manufactured by cvs2svn to create tagrelease/7.0.0_cvs
'RELENG_7_0_0_RELEASE'.
This commit was manufactured to restore the state of the 7.0-RELEASE image.
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..45e7d7ffbf88 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 2003/06/04 09:38:04 dougb Exp $ SCRIPTS=mergemaster.sh MAN= mergemaster.8 diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 63cf2ab1ee88..4a350b7388bd 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.36 2006/04/30 22:09:47 gordon Exp $ .\" .Dd February 4, 2006 .Dt MERGEMASTER 8 diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index e21d466fc9e8..03f6ed039176 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -8,7 +8,7 @@ # Copyright 1998-2004 Douglas Barton # DougB@FreeBSD.org -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.54.4.1 2007/12/24 06:33:22 dougb Exp $ PATH=/bin:/usr/bin:/usr/sbin |