[src/trunk]: src/share/man/man3 fix merge conflicts

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0f56d82131e9
branches:  trunk
changeset: 785779:0f56d82131e9
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Mar 29 22:51:04 2013 +0000

description:
fix merge conflicts

diffstat:

 share/man/man3/tree.3 |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r f26f9708cd6b -r 0f56d82131e9 share/man/man3/tree.3
--- a/share/man/man3/tree.3     Fri Mar 29 21:59:51 2013 +0000
+++ b/share/man/man3/tree.3     Fri Mar 29 22:51:04 2013 +0000
@@ -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 <provos%citi.umich.edu@localhost>
@@ -241,7 +241,7 @@
 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 *" .