master 78c3c8c1b0f 2/7: ; Merge from origin/emacs-31

Eli Zaretskii <[email protected]> Sat, 4 Jul 2026 04:30:54 -0400 (EDT)

Newsgroups	gmane.emacs.diffs
Message-ID	<[email protected]>

branch: master
commit 78c3c8c1b0f286be6a157b24c7f19dc9d05e77b8
Merge: 017c7c8c871 a057a32bf97
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    ; Merge from origin/emacs-31
    
    The following commit was skipped:
    
    a057a32bf97 vc-dir-update: Remove assertion invalid on this branch