aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile113logplainblame
-rw-r--r--mergemaster.810774logplainblame
-rwxr-xr-xmergemaster.sh27648logplainblame