d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Update copyright year.

Browse Source 
* Add an example that ignores CVS Id tags for the new DIFF_OPTIONS variable.
This commit is contained in:
Doug Barton 2003-02-05 11:03:05 +00:00
parent fa9a98f858
commit 00482d1917
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=110375
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/mergemaster/mergemaster.8
View File

@ -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=
#