Doug Barton 1d825c58fb * 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.		2003-02-05 11:09:21 +00:00
..
Makefile	Perform a major cleanup of the usr.sbin Makefiles.	2001-07-20 06:20:32 +00:00
mergemaster.8	* Update copyright year.	2003-02-05 11:03:05 +00:00
mergemaster.sh	* Update copyright year.	2003-02-05 11:09:21 +00:00