Change choosing strategy for docs merge to git-scm 73/27673/2
[releng.git] / jjb / conductor /
drwxr-xr-x   ..
-rw-r--r-- 1814 conductor.yml