diff options
author | Doug Barton <dougb@FreeBSD.org> | 2003-02-10 06:35:34 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2003-02-10 06:35:34 +0000 |
commit | 687e6ad79b42bc784b694dc7bb8a657e722a5cee (patch) | |
tree | d2a4118b0eb06313c2a1ae9589ac2f06ac82ae52 /usr.sbin/mergemaster/mergemaster.8 | |
parent | efb75db1a433ebc4ac5054b5dd7bff8052147dea (diff) | |
download | src-687e6ad79b42bc784b694dc7bb8a657e722a5cee.tar.gz src-687e6ad79b42bc784b694dc7bb8a657e722a5cee.zip |
Try to fix two problems with the -I example. One is the fact that we
want to match a character $, not EOL. The other is that CVS helpfully
expanded my example into an actual CVS tag.
Submitted by: gad
Notes
Notes:
svn path=/head/; revision=110633
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.8')
-rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 1013ac8c4d9a..8d0d3f351182 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -305,7 +305,7 @@ with all values commented out: #DIFF_FLAG='-u' # # Additional options for diff. This will get unset when using -s. -#DIFF_OPTIONS='-I$FreeBSD$' # Ignores CVS Id tags +#DIFF_OPTIONS='-I$FreeBSD$]' # Ignores CVS Id tags # # Verbose mode includes more details and additional checks #VERBOSE= |