aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile251logplainblame
-rwxr-xr-xmergemaster19860logplainblame
-rw-r--r--mergemaster.88407logplainblame
-rwxr-xr-xmergemaster.sh19860logplainblame