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.
