Skip to content

Commit

Permalink
cvs up
Browse files Browse the repository at this point in the history
  • Loading branch information
brynet committed Aug 3, 2015
1 parent 8d2a48b commit 8b925a0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CVS/Entries
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ D/magdir////
/file.h/1.29/Thu Apr 30 04:30:05 2015//
/magic.h/1.6/Result of merge//
/magic-test.c/1.6/Result of merge//
/file.1/1.42/Sat May 30 12:02:14 2015//
/sandbox.c/1.8/Result of merge//
/xmalloc.c/1.2/Result of merge//
/magic-load.c/1.6/Wed Jul 8 17:54:55 2015//
/file.c/1.47/Result of merge//
/file.1/1.43/Mon Aug 3 17:27:35 2015//
5 changes: 3 additions & 2 deletions file.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.\" $OpenBSD: file.1,v 1.42 2015/05/30 06:25:35 nicm Exp $
.\" $OpenBSD: file.1,v 1.43 2015/07/30 11:13:24 jmc Exp $
.\" $FreeBSD: src/usr.bin/file/file.1,v 1.16 2000/03/01 12:19:39 sheldonh Exp $
.\"
.\" Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
Expand Down Expand Up @@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.Dd $Mdocdate: May 30 2015 $
.Dd $Mdocdate: July 30 2015 $
.Dt FILE 1
.Os
.Sh NAME
Expand Down Expand Up @@ -89,6 +89,7 @@ Does not prepend filenames to output lines.
Prints a summary of the parsed magic file; usually used for debugging.
.It Fl h
Causes symlinks not to be followed.
This is the default.
.It Fl i , -mime , -mime-type
Outputs MIME type strings rather than the more
traditional human-readable ones.
Expand Down

0 comments on commit 8b925a0

Please sign in to comment.