aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile254logplainblame
-rw-r--r--mergemaster.88467logplainblame
-rwxr-xr-xmergemaster.sh19986logplainblame