diff options
| author | dougb <dougb@FreeBSD.org> | 2003-02-05 11:03:05 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2003-02-05 11:03:05 +0000 |
| commit | 0b8bb3726695528af3b0d77de22722498d4ffe29 (patch) | |
| tree | d71b9b9306c520506086b0f53984b4c99c7896fb /usr.sbin/mergemaster | |
| parent | d609a6ee0498e2fef7d91391e7a7adf630943bcb (diff) | |
| download | FreeBSD-src-0b8bb3726695528af3b0d77de22722498d4ffe29.zip FreeBSD-src-0b8bb3726695528af3b0d77de22722498d4ffe29.tar.gz | |
* Update copyright year.
* Add an example that ignores CVS Id tags for the new DIFF_OPTIONS variable.
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index b5dddb8..1013ac8 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998-2002 Douglas Barton +.\" Copyright (c) 1998-2003 Douglas Barton .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -301,9 +301,12 @@ with all values commented out: # Strict comparison bypasses the CVS $Id tests and compares every file #STRICT=no # -# Flag(s) to use for diff displayed when files differ +# Type of diff, such as unified, context, etc. #DIFF_FLAG='-u' # +# Additional options for diff. This will get unset when using -s. +#DIFF_OPTIONS='-I$FreeBSD$' # Ignores CVS Id tags +# # Verbose mode includes more details and additional checks #VERBOSE= # |
