14a15
> RCSID("$FreeBSD: head/crypto/openssh/readconf.c 128460 2004-04-20 09:46:41Z des $");
16d16
< RCSID("$FreeBSD: head/crypto/openssh/readconf.c 126277 2004-02-26 10:52:33Z des $");
108a109
> <<<<<<< readconf.c
110a112,114
> =======
> oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
> >>>>>>> 1.1.1.15
151a156
> { "identitiesonly", oIdentitiesOnly },
741a747,750
> case oIdentitiesOnly:
> intptr = &options->identities_only;
> goto parse_flag;
>
881a891
> options->identities_only = - 1;
993a1004,1005
> if (options->identities_only == -1)
> options->identities_only = 0;