From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Feb 2026 21:39:26 +0000 (-0800)
Subject: Merge branch 'sb/merge-ours-sparse'
X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=03dfe4e1afd7314f830703d9559504268863cf1f;p=rit

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
---

03dfe4e1afd7314f830703d9559504268863cf1f