Log Message: ----------- resolve remaining conflict Modified Files: -------------- src/crypto/openssh: ssh_config (r1.8 -> r1.9) (http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh_config?r1=1.8&r2=1.9)