Module Name: src
Committed By: christos
Date: Fri Mar 29 22:51:05 UTC 2013
Modified Files:
src/share/man/man3: tree.3
Log Message:
fix merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/man/man3/tree.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man3/tree.3
diff -u src/share/man/man3/tree.3:1.10 src/share/man/man3/tree.3:1.11
--- src/share/man/man3/tree.3:1.10 Fri Mar 29 17:45:27 2013
+++ src/share/man/man3/tree.3 Fri Mar 29 18:51:04 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: tree.3,v 1.10 2013/03/29 21:45:27 wiz Exp $
+.\" $NetBSD: tree.3,v 1.11 2013/03/29 22:51:04 christos Exp $
.\" $OpenBSD: tree.3,v 1.23 2011/07/09 08:43:01 jmc Exp $
.\"/*
.\" * Copyright 2002 Niels Provos <[email protected]>
@@ -241,7 +241,7 @@ macro, but should be used only once.
Finally,
the
.Fa CMP
-argument is the name of a function used to compare trees' nodes
+argument is the name of a function used to compare tree nodes
with each other.
The function takes two arguments of type
.Fa "struct TYPE *" .
