From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 31 Jul 2026 15:54:06 +0000 (-0700)
Subject: Merge branch 'jk/diff-relative-cached-unmerged-more' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eef728c46a8ba13afc11006af8fc1f4cdd4b6bcb;p=thirdparty%2Fgit.git

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

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

eef728c46a8ba13afc11006af8fc1f4cdd4b6bcb