bdrewery 73b98f0a15 All supported releases have the -m support from r186678, so remove ... the mention of it and reword this a bit to remove 'you'. MFC after: 3 days		2015-09-29 17:54:01 +00:00
..
Makefile
Makefile.depend	Add META_MODE support.	2015-06-13 19:20:56 +00:00
mergemaster.8	All supported releases have the -m support from r186678, so remove	2015-09-29 17:54:01 +00:00
mergemaster.sh