git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-17 16:20:48 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
0437b650cfda170b928ee82c469e749b765f14d9
git/builtin/merge-file.c
Junio C Hamano 828988bef3 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
2026-03-27 11:00:01 -07:00

5.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink