diff options
author | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
commit | e5d801b2d6aab34943ecb74550a852aa69c82f38 (patch) | |
tree | 052572b83faf3cab81bed572534efc6912debcbf /crypto/openssh/ssh.1 | |
parent | efa35724649769e9a081ef6970590dd0b0a97370 (diff) | |
download | FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.zip FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/ssh.1')
-rw-r--r-- | crypto/openssh/ssh.1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1 index 9a140fa..da812d6 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -34,8 +34,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.181 2003/12/16 15:49:51 markus Exp $ .\" $FreeBSD$ +.\" $OpenBSD: ssh.1,v 1.181 2003/12/16 15:49:51 markus Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -636,6 +636,7 @@ For full details of the options listed below, and their possible values, see .It HostKeyAlias .It HostName .It IdentityFile +.It IdentitiesOnly .It LocalForward .It LogLevel .It MACs |