K 10
svn:author
V 6
brooks
K 8
svn:date
V 27
2013-11-22T00:06:11.497433Z
K 7
svn:log
V 331
Fix mergemaster -U by forcing FreeBSD 9 compatiblity in mtree when mtree is
nmtree.

The mtree output used by mergemaster in this case was clearly not meant for
computer consumption and an approach based on -f <file1> -f <file2> would
probalby be a better idea, but this is a minimal change.

MFC after:	3 days
X-MFC-with:	r258437

END