From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Sep 2021 20:30:31 +0000 (-0700)
Subject: Merge branch 'dd/diff-files-unmerged-fix'
X-Git-Tag: v2.34.0-rc0~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8f491668e46d66290aec97caaf94fe2c1ecccbd;p=thirdparty%2Fgit.git

Merge branch 'dd/diff-files-unmerged-fix'

"git diff --relative" segfaulted and/or produced incorrect result
when there are unmerged paths.

* dd/diff-files-unmerged-fix:
  diff-lib: ignore paths that are outside $cwd if --relative asked
---

c8f491668e46d66290aec97caaf94fe2c1ecccbd