]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
fix up r354804, resolve merge conflicts in zpool.8
authoravg <avg@FreeBSD.org>
Wed, 20 Nov 2019 08:49:13 +0000 (08:49 +0000)
committeravg <avg@FreeBSD.org>
Wed, 20 Nov 2019 08:49:13 +0000 (08:49 +0000)
commitb4e24cd217de1195a9ba38192ded66076aa64672
tree0bb9264eb73b0defa5ff7d4376f70ed4126a7327
parent43af250c9471507514ffa90e44036a5322129912
fix up r354804, resolve merge conflicts in zpool.8

Somehow I managed to commit the manual page with unresolved conflicts in
it.

While here, I also replaced .sp with .Pp.

MFC after: 3 weeks
X-MFC with: r354804
cddl/contrib/opensolaris/cmd/zpool/zpool.8