diff options
author | dougb <dougb@FreeBSD.org> | 2009-03-23 14:42:41 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2009-03-23 14:42:41 +0000 |
commit | 7f2fbec4926704c41c44adbe902ab6f2441ec3b2 (patch) | |
tree | c06a79604bb48df2a99f084328bf45db78866343 /usr.sbin/mergemaster/mergemaster.8 | |
parent | 8ca7a264d2db4b426d25dd61d72c6e0c67c445ee (diff) | |
download | FreeBSD-src-7f2fbec4926704c41c44adbe902ab6f2441ec3b2.zip FreeBSD-src-7f2fbec4926704c41c44adbe902ab6f2441ec3b2.tar.gz |
Don't tempt svn to expand the example $FreeBSD strings
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.8')
-rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 6 |
1 files changed, 3 insertions, 3 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 |