Bring in some miscellaneous changes from OpenBSD and point to an
[dragonfly/port-amd64.git] / usr.sbin / mergemaster / 
tree1eeea100f2ce61b15d1da807140c88eb55455570
drwxr-xr-x   ..
-rw-r--r-- 245 Makefile
-rw-r--r-- 10956 mergemaster.8
-rw-r--r-- 28884 mergemaster.sh