tree 51c2bb419ef22e3ac3309ebe6523e422e403b90c
parent 11cbda2add5d3eb7c415f1f6dd8186181a7f9874
parent 3080c5098049228cd561f08ee4cc31839251d579
author Junio C Hamano <gitster@pobox.com> 1594098557 -0700
committer Junio C Hamano <gitster@pobox.com> 1594098557 -0700

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