d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't tempt svn to expand the example $FreeBSD strings

Browse Source
This commit is contained in:
Doug Barton 2009-03-23 14:42:41 +00:00
parent c9ffd9f058
commit 86780e2538
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/mergemaster/mergemaster.8
View File

@ -82,7 +82,7 @@ merge by hand later.
By default it creates the temporary root in
.Pa /var/tmp/temproot
and compares the
Version Control System (VCS) Id strings ($FreeBSD$)
Version Control System (VCS) Id strings ($FreeBSD)
for files that have them, deleting
the temporary file if the strings match.
If there is
@ -216,7 +216,7 @@ Compares only files known to be essential to the success of
including
.Pa /etc/make.conf .
.It Fl F
If the files differ only by VCS Id ($FreeBSD$)
If the files differ only by VCS Id ($FreeBSD)
install the new file.
.It Fl C
After a standard
@ -338,7 +338,7 @@ with all values commented out:
# Type of diff, such as unified, context, etc.
#DIFF_FLAG='-u'
#
# Install the new file if it differs only by VCS Id ($FreeBSD$)
# Install the new file if it differs only by VCS Id ($FreeBSD)
#FREEBSD_ID=
#
# Verbose mode includes more details and additional checks

2
usr.sbin/mergemaster/mergemaster.sh
View File

@ -26,7 +26,7 @@ display_usage () {
echo " -h Display more complete help"
echo ' -i Automatically install files that do not exist in destination directory'
echo ' -p Pre-buildworld mode, only compares crucial files'
echo ' -F Install files that differ only by revision control Id ($FreeBSD$)'
echo ' -F Install files that differ only by revision control Id ($FreeBSD)'
echo ' -C Compare local rc.conf variables to the defaults'
echo ' -P Preserve files that are overwritten'
echo " -U Attempt to auto upgrade files that have not been user modified"