From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Jul 2020 05:09:17 +0000 (-0700)
Subject: Merge branch 'js/diff-files-i-t-a-fix-for-difftool'
X-Git-Tag: v2.28.0-rc0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ac0947b1470b2157fd4c085a1fd0b207d94b40b;p=thirdparty%2Fgit.git

Merge branch 'js/diff-files-i-t-a-fix-for-difftool'

"git difftool" has trouble dealing with paths added to the index
with the intent-to-add bit.

* js/diff-files-i-t-a-fix-for-difftool:
  difftool -d: ensure that intent-to-add files are handled correctly
  diff-files --raw: show correct post-image of intent-to-add files
---

0ac0947b1470b2157fd4c085a1fd0b207d94b40b