dougb e33dfa4bb1 1. Update for new -F option from r189992. ... 2. Sort the command line options to match how they are displayed in usage() 3. Change references to cvs to the more generic "version control system" and remove the .Xr for cvs 4. Consistently use ".Op Fl" to refer to command line options in the text. 5. Only use the apostrophe to indicate possession. 6. Add FREEBSD_ID (-F) to the list of variables in the example rc, and change the DIFF_OPTIONS example to -Bb since -F now covers it.		2009-03-18 21:55:08 +00:00
..
Makefile
mergemaster.8	1. Update for new -F option from r189992.	2009-03-18 21:55:08 +00:00
mergemaster.sh	Add a new -F option to automatically install files that differ	2009-03-18 21:51:11 +00:00