Bryan Drewery 54859495fb MFC r302674: ...

META_MODE: Don't require filemon(4) for mergemaster(8)/etcupdate(8)

Approved by:	re (gjb)

2016-07-15 19:58:05 +00:00

..

Makefile

…

Makefile.depend

…

mergemaster.8

All supported releases have the -m support from r186678, so remove

2015-09-29 17:54:01 +00:00

mergemaster.sh

MFC r302674:

2016-07-15 19:58:05 +00:00