Merge branch 'vendor/GCC50' - gcc 5.0 snapshot 1 FEB 2015
[dragonfly.git] / usr.sbin / mergemaster /
drwxr-xr-x   ..
-rw-r--r-- 245 Makefile
-rw-r--r-- 10859 mergemaster.8
-rw-r--r-- 28875 mergemaster.sh