diff options
| author | dougb <dougb@FreeBSD.org> | 2003-02-10 06:35:34 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2003-02-10 06:35:34 +0000 |
| commit | 8645f074a0b6a17d0da6706ab9e4c6dbe73713a9 (patch) | |
| tree | d2a4118b0eb06313c2a1ae9589ac2f06ac82ae52 /usr.sbin/mergemaster | |
| parent | 4ec0d56609d33551f37ddb60964ccb5d77b70e07 (diff) | |
| download | FreeBSD-src-8645f074a0b6a17d0da6706ab9e4c6dbe73713a9.zip FreeBSD-src-8645f074a0b6a17d0da6706ab9e4c6dbe73713a9.tar.gz | |
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
Diffstat (limited to 'usr.sbin/mergemaster')
| -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 1013ac8..8d0d3f3 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= |
