aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile111logplainblame
-rw-r--r--mergemaster.811315logplainblame
-rwxr-xr-xmergemaster.sh28673logplainblame