Baptiste Daroussin 073dd71287 In preparation for removal of GNU rcs, replace merge(1) usage with direct ... diff3(1) usage		2016-09-18 14:48:28 +00:00
..
freebsd-update.8	Add --currently-running <release> option to freebsd-update.	2015-10-09 12:34:33 +00:00
freebsd-update.sh	In preparation for removal of GNU rcs, replace merge(1) usage with direct	2016-09-18 14:48:28 +00:00
Makefile
Makefile.depend	Add META_MODE support.	2015-06-13 19:20:56 +00:00