From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Aug 2026 21:48:00 +0000 (-0700)
Subject: Merge branch 'jk/diff-relative-cached-unmerged-more'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=babe559ffb0a3ffd8c72641d318091c36e8ef2d5;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-relative-cached-unmerged-more'

The code path that deals with relative paths in the 'diff-lib' has
been cleaned up.

* jk/diff-relative-cached-unmerged-more:
  diff-lib: skip paths outside prefix in oneway_diff()
  diff-lib: drop stale comment about advancing o->pos
---

babe559ffb0a3ffd8c72641d318091c36e8ef2d5