K 10
svn:author
V 7
git2svn
K 8
svn:date
V 27
2022-02-07T13:57:58.600335Z
K 7
svn:log
V 745
ipfilter userland: Fix branch mismerge

The work to ANSIfy and adjust returns to style(9) resulted in a mismerge
of a stash when ipfilter was moved from contrib to sbin. An older file
replaced WIP at the time, resulting in a regression.

The majority of this work was done in 2018 saved as git stashes within
a git-svn tree and migrated to the git tree. The regression occurred
when the various stashes were sequentially merged to create individual
commits, following the ipfilter move to netpfil and sbin.

Reported by:	jrtc27
Fixes:		2582ae5740181e0d2bab10003d66ae91c9b56329
Pointy hat to:	cy

(cherry picked from commit a3522837b021a46f2de81303247599ea51163d13)

Git Hash:   c9e2a67a6d1a2da375badc48dd32a36fefff08c2
Git Author: cy@FreeBSD.org
END