Date: Wed, 5 Feb 2003 03:09:21 -0800 (PST) From: Doug Barton <dougb@FreeBSD.org> To: all-committers@FreeBSD.org, legacy-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200302051109.h15B9LWA089199@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2003/02/05 03:09:21 PST
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
* Update copyright year.
* Give back one line of ws when showing a diff.
This was requested by several.
* Un-quote DIFF_FLAG, and add DIFF_OPTIONS. This will allow the user to
do more creative things in a mergemaster rc file. Un-quoting is necessary
in order to handle things like CVS Id tags that look like shell variables.
* Simplify terminal width determination.
Suggestions related to ignoring the CVS Id's were taken from several, with
dillon and gad providing particularly helpful feedback.
Revision Changes Path
1.41 +6 -5 src/usr.sbin/mergemaster/mergemaster.sh
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302051109.h15B9LWA089199>