summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile80logstatsplain
-rw-r--r--Makefile.depend176logstatsplain
-rw-r--r--mergemaster.813103logstatsplain
-rwxr-xr-xmergemaster.sh40226logstatsplain
OpenPOWER on IntegriCloud