aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile222logplainblame
-rwxr-xr-xmergemaster19848logplainblame
-rw-r--r--mergemaster.88448logplainblame
-rwxr-xr-xmergemaster.sh19848logplainblame