summaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile152logplainblame
-rw-r--r--mergemaster.811605logplainblame
-rwxr-xr-xmergemaster.sh33087logplainblame