Doug Barton b3559845fb * Add some niceties to make the -p option quieter, and better behaved ... * Take a simple idea about setting the screen width using stty (for sdiff's purposes) thoughtfully suggested by Joerg to an absurd conclusion.		2002-05-04 22:45:12 +00:00
..
Makefile	Perform a major cleanup of the usr.sbin Makefiles.	2001-07-20 06:20:32 +00:00
mergemaster.8	Document the two new options, pre buildworld mode and	2002-04-08 09:49:40 +00:00
mergemaster.sh	* Add some niceties to make the -p option quieter, and better behaved	2002-05-04 22:45:12 +00:00