Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/man/man7/hier.7,v
rcsdiff: /ftp/cvs/cvsroot/src/share/man/man7/hier.7,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.99
retrieving revision 1.99.6.1
diff -u -p -r1.99 -r1.99.6.1
--- src/share/man/man7/hier.7	2011/04/26 16:57:39	1.99
+++ src/share/man/man7/hier.7	2012/06/23 22:54:56	1.99.6.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.99 2011/04/26 16:57:39 joerg Exp $
+.\"	$NetBSD: hier.7,v 1.99.6.1 2012/06/23 22:54:56 riz Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)hier.7	8.5 (Berkeley) 6/1/94
 .\"
-.Dd April 1, 2011
+.Dd June 3, 2012
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -572,11 +572,23 @@ macro package
 .It Sy misc/
 miscellaneous system-wide text files
 .Pp
+<<<<<<< hier.7
 .Bl -tag -width "termcap" -compact
 .It Sy termcap
+=======
+.Bl -tag -width "terminfo.cdb" -compact
+.It Sy terminfo
+>>>>>>> 1.101
 terminal characteristics database;
 see
+<<<<<<< hier.7
 .Xr termcap 5
+=======
+.Xr terminfo 5
+.It Sy terminfo.cdb
+database form of terminfo file; see
+.Xr tic 1
+>>>>>>> 1.101
 .El
 .Pp
 .It Sy mk/