Merge branch 'sb/merge-ours-sparse'
"git merge-ours" is taught to work better in a sparse checkout. * sb/merge-ours-sparse: merge-ours: integrate with sparse-index merge-ours: drop USE_THE_REPOSITORY_VARIABLE
Junio C Hamano committed
Feb 13, 2026 at 13:39 UTC
03dfe4e1afd7314f830703d9559504268863cf1f
No changes.