aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile112logplainblame
-rw-r--r--mergemaster.810101logplainblame
-rwxr-xr-xmergemaster.sh23529logplainblame