Fix git difftool
with intent-to-add files
#2733
Merged
git difftool
with intent-to-add files
#2733