aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
ModeNameSize
-rw-r--r--Makefile80logplainblame
-rw-r--r--Makefile.depend176logplainblame
-rw-r--r--mergemaster.813000logplainblame
-rwxr-xr-xmergemaster.sh44639logplainblame