Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup

* da/difftool-dir-diff-fix: difftool: fix dir-diff index creation when in a subdirectory

Junio C Hamano committed Feb 8, 2017 at 13:36 UTC a83c2d2972b7821e45192df08142d27ebc51da48

No changes.