Module Name: src
Committed By: agc
Date: Mon Nov 28 06:36:14 UTC 2011
Modified Files:
src/crypto/external/bsd/openssh/dist: ssh-keygen.1
Log Message:
get rid of an old merge conflict which managed to creep through
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/ssh-keygen.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/ssh-keygen.1
diff -u src/crypto/external/bsd/openssh/dist/ssh-keygen.1:1.6 src/crypto/external/bsd/openssh/dist/ssh-keygen.1:1.7
--- src/crypto/external/bsd/openssh/dist/ssh-keygen.1:1.6 Wed Sep 7 17:49:19 2011
+++ src/crypto/external/bsd/openssh/dist/ssh-keygen.1 Mon Nov 28 06:36:14 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: ssh-keygen.1,v 1.6 2011/09/07 17:49:19 christos Exp $
+.\" $NetBSD: ssh-keygen.1,v 1.7 2011/11/28 06:36:14 agc Exp $
.\" $OpenBSD: ssh-keygen.1,v 1.106 2011/04/13 04:09:37 djm Exp $
.\"
.\" -*- nroff -*-
@@ -410,12 +410,9 @@ new passphrase.
.It Fl q
Silence
.Nm ssh-keygen .
-<<<<<<< ssh-keygen.1
Used by
.Pa /etc/rc.d/sshd
when creating a new key.
-=======
->>>>>>> 1.1.1.4
.It Fl R Ar hostname
Removes all keys belonging to
.Ar hostname
