diff options
| author | dougb <dougb@FreeBSD.org> | 2003-02-27 08:29:30 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2003-02-27 08:29:30 +0000 |
| commit | 87b92d30e16eef81ad163b42c9374255fd9b9760 (patch) | |
| tree | cf4e6fd7d311624c0c3c31f57e800cc10819504f /usr.sbin/mergemaster | |
| parent | 8e7930f85b79149c516b4d63de15dfcc61a33888 (diff) | |
| download | FreeBSD-src-87b92d30e16eef81ad163b42c9374255fd9b9760.zip FreeBSD-src-87b92d30e16eef81ad163b42c9374255fd9b9760.tar.gz | |
Try another solution for not expanding a CVS tag.
Submitted by: roam
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 8d0d3f3..b88c283 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= |
