aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile225logplainblame
-rw-r--r--mergemaster.89918logplainblame
-rwxr-xr-xmergemaster.sh22546logplainblame