From: Junio C Hamano Date: Wed, 8 Feb 2017 21:36:03 +0000 (-0800) Subject: Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup X-Git-Tag: v2.12.0-rc1~4^2~1 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=a83c2d2972b7821e45192df08142d27ebc51da48 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 --- a83c2d2972b7821e45192df08142d27ebc51da48