summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Almost a year exactly from when I first imported mergemaster at freebsdcon,billf2000-10-261-2/+1
* ``mergemaster'' was repo-copied to ``mergemaster.sh'' as it's a shell script.chris1999-11-011-1/+1
* Co-MAINTAINER this module.billf1999-10-261-0/+1
* mergemaster bmake glue.billf1999-10-201-0/+11
OpenPOWER on IntegriCloud