Conditionalize thread2.h so /usr/src/usr.bin/fstat can include vm_object.h.
[dragonfly.git] / usr.sbin / mergemaster /
drwxr-xr-x   ..
-rw-r--r-- 245 Makefile
-rw-r--r-- 10951 mergemaster.8
-rw-r--r-- 28884 mergemaster.sh