Fix a bug in the last commit. 4.x improperly tries to add the children
[dragonfly.git] / usr.sbin / mergemaster /
drwxr-xr-x   ..
-rw-r--r-- 245 Makefile
-rw-r--r-- 10950 mergemaster.8
-rw-r--r-- 28849 mergemaster.sh