summaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile160logplainblame
-rw-r--r--mergemaster.812904logplainblame
-rwxr-xr-xmergemaster.sh37660logplainblame