fix merge conflicts

This commit is contained in:
christos 2013-03-29 22:51:04 +00:00
parent ef6edfe862
commit 027c677d2a
1 changed files with 2 additions and 2 deletions

View File

@ -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>
@ -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 *" .