From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Mar 2026 18:00:01 +0000 (-0700)
Subject: Merge branch 'mr/merge-file-object-id-worktree-fix'
X-Git-Tag: v2.54.0-rc0~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=828988bef368456e613a0e0bb5f1ba9580a6b341;p=thirdparty%2Fgit.git

Merge branch 'mr/merge-file-object-id-worktree-fix'

merge-file --object-id used to trigger a BUG when run in a linked
worktree, which has been fixed.

* mr/merge-file-object-id-worktree-fix:
  merge-file: fix BUG when --object-id is used in a worktree
---

828988bef368456e613a0e0bb5f1ba9580a6b341