diff options
-rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 6 | ||||
-rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index e73812b..2bff4be 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -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 diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index ad4dcdf..e444996 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -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" |