git: 1e5e331b1dce - main - Correct mergeinfo from 1.14.0 import

From: Enji Cooper <ngie_at_FreeBSD.org>
Date: Sat, 19 Oct 2024 02:14:41 UTC
The branch main has been updated by ngie:

URL: https://cgit.FreeBSD.org/src/commit/?id=1e5e331b1dce6c8bc05def42b41234c4f1fcea44

commit 1e5e331b1dce6c8bc05def42b41234c4f1fcea44
Merge: 92c5681cc347 8ef491440fca
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2024-10-19 02:08:30 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2024-10-19 02:10:07 +0000

    Correct mergeinfo from 1.14.0 import
    
    This will help ensure that future vendor updates for this component will
    be more seamless.
    
    Suggested by:   jtrc27
    Fixes:          28f6c2f292806bf31230a959bc4b19d7081669a7