aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile80logplainblame
-rw-r--r--mergemaster.811322logplainblame
-rwxr-xr-xmergemaster.sh30101logplainblame