git: Merge branch 'vendor/FILE'

[Antonio Huete Jimenez]

commit 739f0ef867128a933e021db3d831e906fcafd825
Merge: 60a39bf65d 3b9cdfa350
Author: Antonio Huete Jimenez <tuxillo at quantumachine.net>
Date:   Sat Nov 12 18:40:03 2022 +0100

    Merge branch 'vendor/FILE'
    
    Conflicts:
    	contrib/file/src/file.h

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/739f0ef867128a933e021db3d831e906fcafd825


-- 
DragonFly BSD source repository