aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile68logplainblame
-rw-r--r--Makefile.depend164logplainblame
-rw-r--r--mergemaster.813133logplainblame
-rwxr-xr-xmergemaster.sh44612logplainblame