Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external/bsd/heimdal/dist/admin Fix a merge miss



details:   https://anonhg.NetBSD.org/src/rev/ef16e19dd7c8
branches:  trunk
changeset: 328933:ef16e19dd7c8
user:      pettai <pettai%NetBSD.org@localhost>
date:      Fri Apr 25 00:26:16 2014 +0000

description:
Fix a merge miss

diffstat:

 crypto/external/bsd/heimdal/dist/admin/ktutil.8 |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 86ca7242854e -r ef16e19dd7c8 crypto/external/bsd/heimdal/dist/admin/ktutil.8
--- a/crypto/external/bsd/heimdal/dist/admin/ktutil.8   Fri Apr 25 00:24:39 2014 +0000
+++ b/crypto/external/bsd/heimdal/dist/admin/ktutil.8   Fri Apr 25 00:26:16 2014 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ktutil.8,v 1.3 2014/04/24 13:45:33 pettai Exp $
+.\"    $NetBSD: ktutil.8,v 1.4 2014/04/25 00:26:16 pettai Exp $
 .\"
 .\" Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
 .\" (Royal Institute of Technology, Stockholm, Sweden).
@@ -55,7 +55,6 @@
 is a program for managing keytabs.
 Supported options:
 .Bl -tag -width Ds
-.It Fl v , Fl -verbose
 .It Fl v , Fl Fl verbose
 Verbose output.
 .El



Home | Main Index | Thread Index | Old Index